Allow Tickets status choices customization

helpdesk/forms.py

@@ -186,10 +186,10 @@ class EditFollowUpForm(forms.ModelForm):
         exclude = ('date', 'user',)
 
     def __init__(self, *args, **kwargs):
-        """Filter not openned tickets here."""
+        """Filter not opened tickets here."""
         super(EditFollowUpForm, self).__init__(*args, **kwargs)
         self.fields["ticket"].queryset = Ticket.objects.filter(
-            status__in=(Ticket.OPEN_STATUS, Ticket.REOPENED_STATUS))
+            status__in=Ticket.OPEN_STATUSES)
 
 
 class AbstractTicketForm(CustomFieldMixin, forms.Form):

helpdesk/management/commands/escalate_tickets.py

@@ -83,9 +83,12 @@ def escalate_tickets(queues, verbose):
         if verbose:
             print("Processing: %s" % q)
 
+        Q_OPEN_STATUSES = Q()
+        for open_status in Ticket.OPEN_STATUSES:
+            q_open_statuses |= Q(status=open_status)
+        
         for t in q.ticket_set.filter(
-            Q(status=Ticket.OPEN_STATUS) |
+            Q_OPEN_STATUSES
-                Q(status=Ticket.REOPENED_STATUS)
         ).exclude(
             priority=1
         ).filter(

helpdesk/models.py

@@ -463,19 +463,14 @@ class Ticket(models.Model):
     the dashboard to prompt users to take ownership of them.
     """
 
-    OPEN_STATUS = 1
+    OPEN_STATUS = helpdesk_settings.OPEN_STATUS
-    REOPENED_STATUS = 2
+    REOPENED_STATUS = helpdesk_settings.REOPENED_STATUS
-    RESOLVED_STATUS = 3
+    RESOLVED_STATUS = helpdesk_settings.RESOLVED_STATUS
-    CLOSED_STATUS = 4
+    CLOSED_STATUS = helpdesk_settings.CLOSED_STATUS
-    DUPLICATE_STATUS = 5
+    DUPLICATE_STATUS = helpdesk_settings.DUPLICATE_STATUS
 
-    STATUS_CHOICES = (
+    STATUS_CHOICES = helpdesk_settings.TICKET_STATUS_CHOICES
-        (OPEN_STATUS, _('Open')),
+    OPEN_STATUSES = helpdesk_settings.TICKET_OPEN_STATUSES
-        (REOPENED_STATUS, _('Reopened')),
-        (RESOLVED_STATUS, _('Resolved')),
-        (CLOSED_STATUS, _('Closed')),
-        (DUPLICATE_STATUS, _('Duplicate')),
-    )
 
     PRIORITY_CHOICES = helpdesk_settings.TICKET_PRIORITY_CHOICES
 
@@ -771,9 +766,8 @@ class Ticket(models.Model):
         True = any dependencies are resolved
         False = There are non-resolved dependencies
         """
-        OPEN_STATUSES = (Ticket.OPEN_STATUS, Ticket.REOPENED_STATUS)
         return TicketDependency.objects.filter(ticket=self).filter(
-            depends_on__status__in=OPEN_STATUSES).count() == 0
+            depends_on__status__in=Ticket.OPEN_STATUSES).count() == 0
     can_be_resolved = property(_can_be_resolved)
 
     def get_submitter_userprofile(self):

helpdesk/settings.py

@@ -103,6 +103,29 @@ ALLOWED_URL_SCHEMES = getattr(settings, 'ALLOWED_URL_SCHEMES', (
     'file', 'ftp', 'ftps', 'http', 'https', 'irc', 'mailto', 'sftp', 'ssh', 'tel', 'telnet', 'tftp', 'vnc', 'xmpp',
 ))
 
+# Ticket status choices
+OPEN_STATUS = getattr(settings, 'HELPDESK_TICKET_OPEN_STATUS', 1)
+REOPENED_STATUS = getattr(settings, 'HELPDESK_TICKET_REOPENED_STATUS', 2)
+RESOLVED_STATUS = getattr(settings, 'HELPDESK_TICKET_RESOLVED_STATUS', 3)
+CLOSED_STATUS = getattr(settings, 'HELPDESK_TICKET_CLOSED_STATUS', 4)
+DUPLICATE_STATUS = getattr(settings, 'HELPDESK_TICKET_DUPLICATE_STATUS', 5)
+
+DEFAULT_TICKET_STATUS_CHOICES = (
+    (OPEN_STATUS, _('Open')),
+    (REOPENED_STATUS, _('Reopened')),
+    (RESOLVED_STATUS, _('Resolved')),
+    (CLOSED_STATUS, _('Closed')),
+    (DUPLICATE_STATUS, _('Duplicate')),
+)
+TICKET_STATUS_CHOICES = getattr(settings,
+                                'HELPDESK_TICKET_STATUS_CHOICES',
+                                DEFAULT_TICKET_STATUS_CHOICES)
+
+DEFAULT_TICKET_OPEN_STATUSES = (OPEN_STATUS, REOPENED_STATUS)       
+TICKET_OPEN_STATUSES = getattr(settings,
+                               'HELPDESK_TICKET_OPEN_STATUSES',
+                               DEFAULT_TICKET_OPEN_STATUSES)
+
 # Ticket priority choices
 DEFAULT_TICKET_PRIORITY_CHOICES = (
     (1, _('1. Critical')),

helpdesk/views/feeds.py

@@ -19,6 +19,11 @@ from helpdesk.models import FollowUp, Queue, Ticket
 User = get_user_model()
 
 
+Q_OPEN_STATUSES = Q()
+for open_status in Ticket.OPEN_STATUSES:
+    q_open_statuses |= Q(status=open_status)
+
+
 class OpenTicketsByUser(Feed):
     title_template = 'helpdesk/rss/ticket_title.html'
     description_template = 'helpdesk/rss/ticket_description.html'
@@ -73,15 +78,12 @@ class OpenTicketsByUser(Feed):
                 assigned_to=obj['user']
             ).filter(
                 queue=obj['queue']
-            ).filter(
+            ).filter(Q_OPEN_STATUSES)
-                Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
             )
         else:
             return Ticket.objects.filter(
                 assigned_to=obj['user']
-            ).filter(
+            ).filter(Q_OPEN_STATUSES)
-                Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
-            )
 
     def item_pubdate(self, item):
         return item.created
@@ -104,9 +106,7 @@ class UnassignedTickets(Feed):
     def items(self, obj):
         return Ticket.objects.filter(
             assigned_to__isnull=True
-        ).filter(
+        ).filter(Q_OPEN_STATUSES)
-            Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
-        )
 
     def item_pubdate(self, item):
         return item.created
@@ -157,9 +157,7 @@ class OpenTicketsByQueue(Feed):
     def items(self, obj):
         return Ticket.objects.filter(
             queue=obj
-        ).filter(
+        ).filter(Q_OPEN_STATUSES)
-            Q(status=Ticket.OPEN_STATUS) | Q(status=Ticket.REOPENED_STATUS)
-        )
 
     def item_pubdate(self, item):
         return item.created