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

* On the homepage, only redirect to the dashboard if the user is not staff (was redirecting if user was authenticated, although dashboard is for staff-only) (Issue #40)

Browse Source 
* When editing a ticket, only show staff users in the 'Assign To' drop-down box (Issue #40)
This commit is contained in:
Ross Poulton 2009-01-19 09:31:24 +00:00
parent fe7d42e257
commit a95fc54586
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
views/public.py
View File

@ -21,7 +21,7 @@ from helpdesk.models import Ticket, Queue
def homepage(request):
if request.user.is_authenticated():
if request.user.is_staff:
if getattr(request.user.usersettings.settings, 'login_view_ticketlist', False):
return HttpResponseRedirect(reverse('helpdesk_list'))
else:

2
views/staff.py
View File

@ -121,7 +121,7 @@ def view_ticket(request, ticket_id):
return render_to_response('helpdesk/ticket.html',
RequestContext(request, {
'ticket': ticket,
'active_users': User.objects.filter(is_active=True, is_staff=True),
'active_users': User.objects.filter(is_active=True).filter(is_staff=True),
'priorities': Ticket.PRIORITY_CHOICES,
'preset_replies': PreSetReply.objects.filter(Q(queues=ticket.queue) | Q(queues__isnull=True)),
}))