Skip to content
Snippets Groups Projects
Commit 7e246d98 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixes in case of non existent computing confs.

parent 6e4f63bb
No related branches found
No related tags found
No related merge requests found
......@@ -24,9 +24,7 @@
<tr>
<td>
<textarea name="new_conf" style="height:300px; width:500px">
{{ data.computing_conf_data}}
</textarea>
<textarea name="new_conf" style="height:300px; width:500px">{{ data.computing_conf_data}}</textarea>
</td>
</tr>
......
......@@ -775,7 +775,7 @@ def edit_computing_conf(request):
raise Exception('Unknown computing "{}"'.format(computing_uuid))
# Get computing conf
computingSysConf = ComputingSysConf.objects.get(computing=computing)
computingSysConf, _ = ComputingSysConf.objects.get_or_create(computing=computing)
# Edit conf?
if new_conf:
......@@ -785,8 +785,9 @@ def edit_computing_conf(request):
computingSysConf.save()
data['saved'] = True
# Dump conf data for the webpage
data['computing_conf_data'] = json.dumps(computingSysConf.data)
# Dump conf data for the webpage
if computingSysConf.data:
data['computing_conf_data'] = json.dumps(computingSysConf.data)
elif computing_conf_type == 'user':
......@@ -800,7 +801,7 @@ def edit_computing_conf(request):
raise Exception('Unknown computing "{}"'.format(computing_uuid))
# Get computing conf
computingUserConf = ComputingUserConf.objects.get(computing=computing)
computingUserConf, _ = ComputingUserConf.objects.get_or_create(computing=computing, user=request.user)
# Edit conf?
if new_conf:
......@@ -811,7 +812,8 @@ def edit_computing_conf(request):
data['saved'] = True
# Dump conf data for the webpage
data['computing_conf_data'] = json.dumps(computingUserConf.data)
if computingUserConf.data:
data['computing_conf_data'] = json.dumps(computingUserConf.data)
else:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment