Address deprecation warnings to be compatible with Django 2.0

This commit is contained in:
Garret Wassermann
2017-12-28 07:23:51 -05:00
parent f91762d4cd
commit 5112f0dfd0
10 changed files with 55 additions and 34 deletions

View File

@ -23,7 +23,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):
@ -61,7 +61,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)