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

Merge pull request #35 from chrismeyersfsu/housekeeping-system_job_template_launch

Browse Source 
removed system job specific code that handles extra_vars
This commit is contained in:
Matthew Jones
2015-01-23 14:52:28 -05:00
parent b530538b03 51a7d403db
commit 1c19924b9a
2 changed files with 3 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/api/views.py
View File

@@ -1739,19 +1739,9 @@ class SystemJobTemplateLaunch(GenericAPIView):
obj = self.get_object()
if not request.user.can_access(self.model, 'start', obj):
raise PermissionDenied()
new_job = obj.create_unified_job()
if 'extra_vars' in request.DATA:
try:
if type(request.DATA['extra_vars']) == dict:
extra_vars = request.DATA['extra_vars']
else:
extra_vars = json.loads(request.DATA['extra_vars'])
except Exception, e:
extra_vars = {}
else:
extra_vars = {}
ev = {'extra_vars': extra_vars}
result = new_job.signal_start(**ev)
new_job = obj.create_unified_job(**request.DATA)
result = new_job.signal_start(**request.DATA)
data = dict(system_job=new_job.id)
return Response(data, status=status.HTTP_202_ACCEPTED)