Merge pull request #319 from tony-zhu/master

Remove no effect model property to silence django 1.8 system check warning
django-helpdesk · Apr 15, 2015 · 2776b89 · 2776b89
2 parents 5e0ee1e + 807e0c5
commit 2776b89
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/helpdesk/models.py b/helpdesk/models.py
@@ -715,7 +715,6 @@ class PreSetReply(models.Model):
     queues = models.ManyToManyField(
         Queue,
         blank=True,
-        null=True,
         help_text=_('Leave blank to allow this reply to be used for all '
             'queues, or select those queues you wish to limit this reply to.'),
         )
@@ -757,7 +756,6 @@ class EscalationExclusion(models.Model):
     queues = models.ManyToManyField(
         Queue,
         blank=True,
-        null=True,
         help_text=_('Leave blank for this exclusion to be applied to all '
             'queues, or select those queues you wish to exclude with this '
             'entry.'),
@@ -1061,7 +1059,6 @@ class IgnoreEmail(models.Model):
     queues = models.ManyToManyField(
         Queue,
         blank=True,
-        null=True,
         help_text=_('Leave blank for this e-mail to be ignored on all '
             'queues, or select those queues you wish to ignore this e-mail '
             'for.'),

diff --git a/helpdesk/views/api.py b/helpdesk/views/api.py
@@ -324,5 +324,4 @@ def api_public_resolve(self):
 
         ticket.save()
 
-        return api_return(STATUS_OK)
-
+        return api_return(STATUS_OK)