extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-16 19:01:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge master 0.2.3 bugfixes into develop

Browse Source
This commit is contained in:
Garret Wassermann
2017-12-09 23:02:12 -05:00
parent 6e2a16e5a6 980e8b6f7d
commit 92b43ef495
23 changed files with 3472 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
helpdesk/models.py
View File

@ -526,10 +526,11 @@ class Ticket(models.Model):
a URL to the submitter of a ticket.
"""
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
try:
site = Site.objects.get_current()
except:
except ImproperlyConfigured:
site = Site(domain='configure-django-sites.com')
return u"http://%s%s?ticket=%s&email=%s" % (
site.domain,
@ -545,10 +546,11 @@ class Ticket(models.Model):
a staff member (in emails etc)
"""
from django.contrib.sites.models import Site
from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
try:
site = Site.objects.get_current()
except:
except ImproperlyConfigured:
site = Site(domain='configure-django-sites.com')
return u"http://%s%s" % (
site.domain,
@ -1149,6 +1151,7 @@ def create_usersettings(sender, instance, created, **kwargs):
if created:
UserSettings.objects.create(user=instance, settings=DEFAULT_USER_SETTINGS)
models.signals.post_save.connect(create_usersettings, sender=settings.AUTH_USER_MODEL)