extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-09 00:04:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-public-ticket-defaults

Browse Source
This commit is contained in:
Garret Wassermann
2018-01-10 13:18:29 -05:00
committed by GitHub
parent 1b7214a797 bad1ece1c5
commit ed0596e430
28 changed files with 88 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helpdesk/views/public.py
View File

@ -24,7 +24,7 @@ from helpdesk.models import Ticket, Queue, UserSettings, KBCategory
@protect_view
def homepage(request):
if request.user.is_staff or \
(request.user.is_authenticated() and
(request.user.is_authenticated and
helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE):
try:
if request.user.usersettings_helpdesk.settings.get('login_view_ticketlist', False):
@ -75,7 +75,7 @@ def homepage(request):
if queue:
initial_data['queue'] = queue.id
if request.user.is_authenticated() and request.user.email:
if request.user.is_authenticated and request.user.email:
initial_data['submitter_email'] = request.user.email
form = PublicTicketForm(initial=initial_data)