mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into develop-2.2

Browse Source 
Conflicts:
	netbox/utilities/api.py
This commit is contained in:
Jeremy Stretch
2017-10-11 10:47:21 -04:00
parent f253f164a3 b69bf58c63
commit 007f930fed
6 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/utilities/api.py
View File

@@ -5,7 +5,6 @@ from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.http import Http404
from rest_framework.compat import is_authenticated
from rest_framework.exceptions import APIException
from rest_framework.permissions import BasePermission
from rest_framework.response import Response
@@ -32,7 +31,7 @@ class IsAuthenticatedOrLoginNotRequired(BasePermission):
def has_permission(self, request, view):
if not settings.LOGIN_REQUIRED:
return True
return request.user and is_authenticated(request.user)
return request.user.is_authenticated()
#