removed system job code that handles extra_vars in favor using common (unified job) code alread in use by normal jobs

This commit is contained in:
Chris Meyers
2015-01-22 09:05:43 -05:00
parent 7e822c34d5
commit 51a7d403db
2 changed files with 3 additions and 32 deletions

View File

@@ -1732,19 +1732,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)