Some fixes for passing arguments to system/management jobs

This commit is contained in:
Matthew Jones
2014-12-12 13:40:10 -05:00
parent c0f4f7185b
commit 1e1ea4e9ee
2 changed files with 11 additions and 6 deletions

View File

@@ -1755,8 +1755,11 @@ class SystemJobTemplateLaunch(GenericAPIView):
new_job = obj.create_unified_job()
if 'extra_vars' in request.DATA:
try:
extra_vars = json.loads(request.DATA['extra_vars'])
except Exception:
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 = {}