Merge pull request #895 from Benbb96/merging-tickets-feature

New feature:  Merging tickets

helpdesk/email.py

@@ -337,9 +337,15 @@ def create_object_from_email_message(message, ticket_id, payload, files, logger)
     if previous_followup is None and ticket_id is not None:
         try:
             ticket = Ticket.objects.get(id=ticket_id)
-            new = False
         except Ticket.DoesNotExist:
             ticket = None
+        else:
+            new = False
+            # Check if the ticket has been merged to another ticket
+            if ticket.merged_to:
+                logger.info("Ticket has been merged to %s" % ticket.merged_to.ticket)
+                # Use the ticket in which it was merged to for next operations
+                ticket = ticket.merged_to
 
     # New issue, create a new <Ticket> instance
     if ticket is None:

helpdesk/forms.py

@@ -8,7 +8,7 @@
 """
 import logging
 
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django import forms
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
@@ -510,3 +510,22 @@ class TicketDependencyForm(forms.ModelForm):
     class Meta:
         model = TicketDependency
         exclude = ('ticket',)
+
+
+class MultipleTicketSelectForm(forms.Form):
+    tickets = forms.ModelMultipleChoiceField(
+        label=_('Tickets to merge'),
+        queryset=Ticket.objects.filter(merged_to=None),
+        widget=forms.SelectMultiple(attrs={'class': 'form-control'})
+    )
+
+    def clean_tickets(self):
+        tickets = self.cleaned_data.get('tickets')
+        if len(tickets) < 2:
+            raise ValidationError(_('Please choose at least 2 tickets.'))
+        if len(tickets) > 4:
+            raise ValidationError(_('Impossible to merge more than 4 tickets...'))
+        queues = tickets.order_by('queue').distinct().values_list('queue', flat=True)
+        if len(queues) != 1:
+            raise ValidationError(_('All selected tickets must share the same queue in order to be merged.'))
+        return tickets

helpdesk/lib.py

@@ -26,7 +26,7 @@ def ticket_template_context(ticket):
     for field in ('title', 'created', 'modified', 'submitter_email',
                   'status', 'get_status_display', 'on_hold', 'description',
                   'resolution', 'priority', 'get_priority_display',
-                  'last_escalation', 'ticket', 'ticket_for_url',
+                  'last_escalation', 'ticket', 'ticket_for_url', 'merged_to',
                   'get_status', 'ticket_url', 'staff_url', '_get_assigned_to'
                   ):
         attr = getattr(ticket, field, None)