External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-16 02:30:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Update Django to 1.8 and DRF to 3.3, add new Django migrations, update serializers/pagination/metadata, update browsable API styling.

Browse Source
This commit is contained in:
Chris Church
2016-02-02 14:50:42 -05:00
parent 6242df1a07
commit 60224cdbe4
140 changed files with 2694 additions and 1375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/permissions.py
View File

@@ -61,7 +61,7 @@ class ModelAccessPermission(permissions.BasePermission):
else:
if obj:
return True
return check_user_access(request.user, view.model, 'add', request.DATA)
return check_user_access(request.user, view.model, 'add', request.data)
def check_put_permissions(self, request, view, obj=None):
if not obj:
@@ -70,10 +70,10 @@ class ModelAccessPermission(permissions.BasePermission):
return True
if getattr(view, 'is_variable_data', False):
return check_user_access(request.user, view.model, 'change', obj,
dict(variables=request.DATA))
dict(variables=request.data))
else:
return check_user_access(request.user, view.model, 'change', obj,
request.DATA)
request.data)
def check_patch_permissions(self, request, view, obj=None):
return self.check_put_permissions(request, view, obj)
@@ -127,7 +127,7 @@ class ModelAccessPermission(permissions.BasePermission):
def has_permission(self, request, view, obj=None):
logger.debug('has_permission(user=%s method=%s data=%r, %s, %r)',
request.user, request.method, request.DATA,
request.user, request.method, request.data,
view.__class__.__name__, obj)
try:
response = self.check_permissions(request, view, obj)
@@ -156,7 +156,7 @@ class JobTemplateCallbackPermission(ModelAccessPermission):
# Require method to be POST, host_config_key to be specified and match
# the requested job template, and require the job template to be
# active in order to proceed.
host_config_key = request.DATA.get('host_config_key', '')
host_config_key = request.data.get('host_config_key', '')
if request.method.lower() != 'post':
raise PermissionDenied()
elif not host_config_key: