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

AC-382, AC-352. Added status and last_updated fields for projects API. Various other updates to support projects using SCM.

Browse Source
This commit is contained in:
Chris Church
2013-09-05 01:19:52 -04:00
parent 15fbf95c2a
commit 72d87fb908
10 changed files with 750 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/views.py
View File

@@ -268,7 +268,7 @@ class ProjectUpdateView(GenericAPIView):
def get(self, request, *args, **kwargs):
obj = self.get_object()
data = dict(
can_update=bool(obj.scm_type),
can_update=obj.can_update,
)
if obj.scm_type:
data['passwords_needed_to_update'] = obj.scm_passwords_needed
@@ -276,13 +276,14 @@ class ProjectUpdateView(GenericAPIView):
def post(self, request, *args, **kwargs):
obj = self.get_object()
if bool(obj.scm_type):
if obj.can_update:
project_update = obj.update(**request.DATA)
if not project_update:
data = dict(passwords_needed_to_update=obj.scm_passwords_needed)
return Response(data, status=status.HTTP_400_BAD_REQUEST)
else:
return Response(status=status.HTTP_202_ACCEPTED)
headers = {'Location': project_update.get_absolute_url()}
return Response(status=status.HTTP_202_ACCEPTED, headers=headers)
else:
return self.http_method_not_allowed(request, *args, **kwargs)
@@ -796,7 +797,7 @@ class JobStart(GenericAPIView):
can_start=obj.can_start,
)
if obj.can_start:
data['passwords_needed_to_start'] = obj.get_passwords_needed_to_start()
data['passwords_needed_to_start'] = obj.asswords_needed_to_start
return Response(data)
def post(self, request, *args, **kwargs):
@@ -804,7 +805,7 @@ class JobStart(GenericAPIView):
if obj.can_start:
result = obj.start(**request.DATA)
if not result:
data = dict(passwords_needed_to_start=obj.get_passwords_needed_to_start())
data = dict(passwords_needed_to_start=obj.passwords_needed_to_start)
return Response(data, status=status.HTTP_400_BAD_REQUEST)
else:
return Response(status=status.HTTP_202_ACCEPTED)