diff --git a/helpdesk/forms.py b/helpdesk/forms.py index eb0dde3f..423a3781 100644 --- a/helpdesk/forms.py +++ b/helpdesk/forms.py @@ -529,9 +529,9 @@ class TicketCCForm(forms.ModelForm): def __init__(self, *args, **kwargs): super(TicketCCForm, self).__init__(*args, **kwargs) if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_CC: - users = User.objects.filter(is_active=True, is_staff=True).order_by('username') + users = User.objects.filter(is_active=True, is_staff=True).order_by(User.USERNAME_FIELD) else: - users = User.objects.filter(is_active=True).order_by('username') + users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD) self.fields['user'].queryset = users class Meta: model = TicketCC diff --git a/helpdesk/models.py b/helpdesk/models.py index 453b337d..cbd42e5d 100644 --- a/helpdesk/models.py +++ b/helpdesk/models.py @@ -351,7 +351,7 @@ class Ticket(models.Model): if self.assigned_to.get_full_name(): return self.assigned_to.get_full_name() else: - return self.assigned_to.username + return self.assigned_to.get_username() get_assigned_to = property(_get_assigned_to) def _get_ticket(self): diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index 9ef38d9c..71ad129e 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -17,7 +17,7 @@ - + diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html index 59bc3f0d..ff3fae31 100644 --- a/helpdesk/templates/helpdesk/navigation.html +++ b/helpdesk/templates/helpdesk/navigation.html @@ -26,13 +26,13 @@ {% for q in user_saved_queries_ %}
  • {{ q.title }} {% if q.shared %} - (Shared{% ifnotequal user q.user %} by {{ q.user.username }}{% endifnotequal %}) + (Shared{% ifnotequal user q.user %} by {{ q.user.get_username }}{% endifnotequal %}) {% endif %}
    • {% endfor %} {% endif %} -
  • {{ user.get_full_name|default:user.username }} +
  • {{ user.get_full_name|default:user.get_username }} {% endblock %} diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 2341037a..57e5a0ea 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -106,7 +106,7 @@ $(document).ready(function() { @@ -199,7 +199,7 @@ $(document).ready(function() {

    @@ -257,7 +257,7 @@ $(document).ready(function() {

    {% trans "All" %} {% trans "None" %} {% trans "Inverse" %}

    -

    +

    {% csrf_token %}
    {% endblock %} diff --git a/helpdesk/templatetags/user_admin_url.py b/helpdesk/templatetags/user_admin_url.py new file mode 100644 index 00000000..5a62f0bd --- /dev/null +++ b/helpdesk/templatetags/user_admin_url.py @@ -0,0 +1,22 @@ +""" +django-helpdesk - A Django powered ticket tracker for small enterprise. + +(c) Copyright 2008 Jutda. All Rights Reserved. See LICENSE for details. + +templatetags/admin_url.py - Very simple template tag allow linking to the + right auth user model urls. + +{% url 'changelist'|user_admin_url %} +""" + +from django import template +from django.contrib.auth import get_user_model + +def user_admin_url(action): + user = get_user_model() + return 'admin:%s_%s_%s' % ( + user._meta.app_label, user._meta.module_name.lower(), + action) + +register = template.Library() +register.filter(user_admin_url) diff --git a/helpdesk/tests/navigation.py b/helpdesk/tests/navigation.py index 08b049b3..832de974 100644 --- a/helpdesk/tests/navigation.py +++ b/helpdesk/tests/navigation.py @@ -25,7 +25,7 @@ class TestKBDisabled(TestCase): """Test proper rendering of navigation.html by accessing the dashboard""" from django.core.urlresolvers import NoReverseMatch - self.client.login(username=get_staff_user().username, password='password') + self.client.login(username=get_staff_user().get_username(), password='password') self.assertRaises(NoReverseMatch, reverse, 'helpdesk_kb_index') try: response = self.client.get(reverse('helpdesk_dashboard')) diff --git a/helpdesk/views/api.py b/helpdesk/views/api.py index 611e9ff2..f5742835 100644 --- a/helpdesk/views/api.py +++ b/helpdesk/views/api.py @@ -110,7 +110,7 @@ class API: def api_public_create_ticket(self): form = TicketForm(self.request.POST) form.fields['queue'].choices = [[q.id, q.title] for q in Queue.objects.all()] - form.fields['assigned_to'].choices = [[u.id, u.username] for u in User.objects.filter(is_active=True)] + form.fields['assigned_to'].choices = [[u.id, u.get_username()] for u in User.objects.filter(is_active=True)] if form.is_valid(): ticket = form.save(user=self.request.user) diff --git a/helpdesk/views/feeds.py b/helpdesk/views/feeds.py index 88c6a632..4efd75b4 100644 --- a/helpdesk/views/feeds.py +++ b/helpdesk/views/feeds.py @@ -38,22 +38,22 @@ class OpenTicketsByUser(Feed): if obj['queue']: return _("Helpdesk: Open Tickets in queue %(queue)s for %(username)s") % { 'queue': obj['queue'].title, - 'username': obj['user'].username, + 'username': obj['user'].get_username(), } else: return _("Helpdesk: Open Tickets for %(username)s") % { - 'username': obj['user'].username, + 'username': obj['user'].get_username(), } def description(self, obj): if obj['queue']: return _("Open and Reopened Tickets in queue %(queue)s for %(username)s") % { 'queue': obj['queue'].title, - 'username': obj['user'].username, + 'username': obj['user'].get_username(), } else: return _("Open and Reopened Tickets for %(username)s") % { - 'username': obj['user'].username, + 'username': obj['user'].get_username(), } def link(self, obj): @@ -90,7 +90,7 @@ class OpenTicketsByUser(Feed): def item_author_name(self, item): if item.assigned_to: - return item.assigned_to.username + return item.assigned_to.get_username() else: return _('Unassigned') @@ -116,7 +116,7 @@ class UnassignedTickets(Feed): def item_author_name(self, item): if item.assigned_to: - return item.assigned_to.username + return item.assigned_to.get_username() else: return _('Unassigned') @@ -168,7 +168,7 @@ class OpenTicketsByQueue(Feed): def item_author_name(self, item): if item.assigned_to: - return item.assigned_to.username + return item.assigned_to.get_username() else: return _('Unassigned') diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index 1aaae4cc..3b5acb1a 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -261,7 +261,7 @@ def return_ticketccstring_and_show_subscribe(user, ticket): ''' used in view_ticket() and followup_edit()''' # create the ticketcc_string and check whether current user is already # subscribed - username = user.username.upper() + username = user.get_username().upper() useremail = user.email.upper() strings_to_check = list() strings_to_check.append(username) @@ -364,7 +364,7 @@ def update_ticket(request, ticket_id, public=False): if owner != 0 and ((ticket.assigned_to and owner != ticket.assigned_to.id) or not ticket.assigned_to): new_user = User.objects.get(id=owner) f.title = _('Assigned to %(username)s') % { - 'username': new_user.username, + 'username': new_user.get_username(), } ticket.assigned_to = new_user reassigned = True @@ -571,7 +571,7 @@ def mass_update(request): if action == 'assign' and t.assigned_to != user: t.assigned_to = user t.save() - f = FollowUp(ticket=t, date=timezone.now(), title=_('Assigned to %(username)s in bulk update' % {'username': user.username}), public=True, user=request.user) + f = FollowUp(ticket=t, date=timezone.now(), title=_('Assigned to %(username)s in bulk update' % {'username': user.get_username()}), public=True, user=request.user) f.save() elif action == 'unassign' and t.assigned_to is not None: t.assigned_to = None @@ -849,14 +849,14 @@ edit_ticket = staff_member_required(edit_ticket) def create_ticket(request): if helpdesk_settings.HELPDESK_STAFF_ONLY_TICKET_OWNERS: - assignable_users = User.objects.filter(is_active=True, is_staff=True).order_by('username') + assignable_users = User.objects.filter(is_active=True, is_staff=True).order_by(User.USERNAME_FIELD) else: - assignable_users = User.objects.filter(is_active=True).order_by('username') + assignable_users = User.objects.filter(is_active=True).order_by(User.USERNAME_FIELD) if request.method == 'POST': form = TicketForm(request.POST, request.FILES) form.fields['queue'].choices = [('', '--------')] + [[q.id, q.title] for q in Queue.objects.all()] - form.fields['assigned_to'].choices = [('', '--------')] + [[u.id, u.username] for u in assignable_users] + form.fields['assigned_to'].choices = [('', '--------')] + [[u.id, u.get_username()] for u in assignable_users] if form.is_valid(): ticket = form.save(user=request.user) return HttpResponseRedirect(ticket.get_absolute_url()) @@ -869,7 +869,7 @@ def create_ticket(request): form = TicketForm(initial=initial_data) form.fields['queue'].choices = [('', '--------')] + [[q.id, q.title] for q in Queue.objects.all()] - form.fields['assigned_to'].choices = [('', '--------')] + [[u.id, u.username] for u in assignable_users] + form.fields['assigned_to'].choices = [('', '--------')] + [[u.id, u.get_username()] for u in assignable_users] if helpdesk_settings.HELPDESK_CREATE_TICKET_HIDE_ASSIGNED_TO: form.fields['assigned_to'].widget = forms.HiddenInput()