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

is_authenticated is a bool now not a function

Browse Source
This commit is contained in:
Garret Wassermann 2018-03-04 04:24:30 -05:00
parent 54a6b1d21b
commit c71355cfdc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helpdesk/decorators.py
View File

@ -12,12 +12,12 @@ if callable(helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE):
is_helpdesk_staff = helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE
elif helpdesk_settings.HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE:
# treat 'normal' users like 'staff'
is_helpdesk_staff = lambda u: u.is_authenticated() and u.is_active
is_helpdesk_staff = lambda u: u.is_authenticated and u.is_active
else:
is_helpdesk_staff = lambda u: u.is_authenticated() and u.is_active and u.is_staff
is_helpdesk_staff = lambda u: u.is_authenticated and u.is_active and u.is_staff
helpdesk_staff_member_required = user_passes_test(is_helpdesk_staff)
helpdesk_superuser_required = user_passes_test(lambda u: u.is_authenticated() and u.is_active and u.is_superuser)
helpdesk_superuser_required = user_passes_test(lambda u: u.is_authenticated and u.is_active and u.is_superuser)
def protect_view(view_func):
"""

2
helpdesk/tests/test_navigation.py
View File

@ -113,7 +113,7 @@ class CustomStaffUserTestCase(StaffUserTestCaseMixin, TestCase):
@staticmethod
def custom_staff_filter(user):
"""Arbitrary user validation function"""
return user.is_authenticated() and user.is_active and user.username.lower().endswith('wensleydale')
return user.is_authenticated and user.is_active and user.username.lower().endswith('wensleydale')
HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE = custom_staff_filter