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

Fixup attach logic for inventory hosts/groups on subcollections. Pass serializer errors through on conflict scenarios.

Browse Source
This commit is contained in:
Michael DeHaan
2013-03-26 19:21:18 -04:00
parent 88b171bd5b
commit c2bffe47d4
5 changed files with 54 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/main/base_views.py
View File

@@ -111,7 +111,7 @@ class BaseSubList(BaseList):
# attempt to deserialize the object
ser = self.__class__.serializer_class(data=request.DATA)
if not ser.is_valid():
return Response(status=status.HTTP_400_BAD_REQUEST, data=python_json.dumps(dict(msg='invalid post data')))
return Response(status=status.HTTP_400_BAD_REQUEST, data=ser.errors)
# ask the usual access control settings
if not self.__class__.model.can_user_add(request.user, ser.init_data):
@@ -126,7 +126,7 @@ class BaseSubList(BaseList):
if not self.__class__.parent_model.can_user_attach(request.user, main, obj, self.__class__.relationship):
raise PermissionDenied()
return Response(status=status.HTTP_201_CREATED, data=python_json.dumps(ser.data))
return Response(status=status.HTTP_201_CREATED, data=ser.data)
else: