holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #154 from satyans24/master

Browse Source 
2- fixes, 1 - fixed issue when user search with email address like : no-reply@tigers-connect.com
This commit is contained in:
Ross Poulton 2012-08-07 03:15:49 -07:00
commit fa850033b2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
helpdesk/views/staff.py
View File

@ -39,7 +39,10 @@ if helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE:
# treat 'normal' users like 'staff' # treat 'normal' users like 'staff'
staff_member_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active) staff_member_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active)
else: else:
staff_member_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active and u.is_staff) try:
from django.contrib.admin.views.decorators import staff_member_required
except:
staff_member_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active and u.is_staff)
superuser_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active and u.is_superuser) superuser_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active and u.is_superuser)
@ -585,8 +588,8 @@ def ticket_list(request):
query = request.GET.get('q') query = request.GET.get('q')
filter = None filter = None
if query.find('-') > 0: if query.find('-') > 0:
queue, id = query.split('-')
try: try:
queue, id = query.split('-')
id = int(id) id = int(id)
except ValueError: except ValueError:
id = None id = None
@ -747,7 +750,7 @@ def ticket_list(request):
context, context,
query_string=querydict.urlencode(), query_string=querydict.urlencode(),
tickets=tickets, tickets=tickets,
user_choices=User.objects.filter(is_active=True), user_choices=User.objects.filter(is_active=True,is_staff=True),
queue_choices=Queue.objects.all(), queue_choices=Queue.objects.all(),
status_choices=Ticket.STATUS_CHOICES, status_choices=Ticket.STATUS_CHOICES,
tag_choices=tag_choices, tag_choices=tag_choices,
@ -783,7 +786,7 @@ def create_ticket(request):
if request.method == 'POST': if request.method == 'POST':
form = TicketForm(request.POST, request.FILES) form = TicketForm(request.POST, request.FILES)
form.fields['queue'].choices = [('', '--------')] + [[q.id, q.title] for q in Queue.objects.all()] 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).order_by('username')] form.fields['assigned_to'].choices = [('', '--------')] + [[u.id, u.username] for u in User.objects.filter(is_active=True,is_staff=True).order_by('username')]
if form.is_valid(): if form.is_valid():
ticket = form.save(user=request.user) ticket = form.save(user=request.user)
return HttpResponseRedirect(ticket.get_absolute_url()) return HttpResponseRedirect(ticket.get_absolute_url())