Merge upstream changes

This commit is contained in:
Tony Zhu
2015-04-14 16:10:13 -04:00
27 changed files with 614 additions and 61 deletions

View File

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