diff --git a/helpdesk/templatetags/ticket_to_link.py b/helpdesk/templatetags/ticket_to_link.py index 6cc4023d..fc2eae21 100644 --- a/helpdesk/templatetags/ticket_to_link.py +++ b/helpdesk/templatetags/ticket_to_link.py @@ -39,7 +39,7 @@ def num_to_link(text): if ticket: style = ticket.get_status_display() text = "%s #%s%s" % ( - text[:match.start()+1], url, style, match.groups()[0], text[match.end():]) + text[:match.start() + 1], url, style, match.groups()[0], text[match.end():]) return mark_safe(text) register = template.Library() diff --git a/helpdesk/tests/test_ticket_actions.py b/helpdesk/tests/test_ticket_actions.py index ca183c1d..7058ca03 100644 --- a/helpdesk/tests/test_ticket_actions.py +++ b/helpdesk/tests/test_ticket_actions.py @@ -12,6 +12,7 @@ except ImportError: # python 2 from helpdesk.templatetags.ticket_to_link import num_to_link + class TicketActionsTestCase(TestCase): fixtures = ['emailtemplate.json'] @@ -122,13 +123,13 @@ class TicketActionsTestCase(TestCase): } response = self.client.post(reverse('helpdesk:update', kwargs={'ticket_id': ticket_id}), post_data, follow=True) self.assertContains(response, 'Changed Status from Open to Closed') - + def test_num_to_link(self): """Test that we are correctly expanding links to tickets from IDs""" - + # make staff user self.loginUser() - + initial_data = { 'title': 'Some private ticket', 'queue': self.queue_public, @@ -139,11 +140,11 @@ class TicketActionsTestCase(TestCase): # create ticket ticket = Ticket.objects.create(**initial_data) ticket_id = ticket.id - + # generate the URL text result = num_to_link('this is ticket#%s' % ticket_id) self.assertEqual(result, "this is ticket #%s" % (ticket_id, ticket_id)) - + result2 = num_to_link('whoa another ticket is here #%s huh' % ticket_id) self.assertEqual(result2, "whoa another ticket is here #%s huh" % (ticket_id, ticket_id))