Improved support for custom user models

Support for custom user models with a non-standard username field
This commit is contained in:
Tom Graham
2014-10-22 16:18:04 +11:00
parent b0756497dc
commit d2ac8af6c0
10 changed files with 27 additions and 27 deletions

View File

@ -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