diff --git a/services/webapp/code/rosetta/base_app/templates/edit_computing_conf.html b/services/webapp/code/rosetta/base_app/templates/edit_computing_conf.html index 67032cb3477d4cd15dda405eddadf06c8d4ceb8c..9a51401d19898399d93b1fdd285f470ff5fb1cac 100644 --- a/services/webapp/code/rosetta/base_app/templates/edit_computing_conf.html +++ b/services/webapp/code/rosetta/base_app/templates/edit_computing_conf.html @@ -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> diff --git a/services/webapp/code/rosetta/base_app/views.py b/services/webapp/code/rosetta/base_app/views.py index 8ae2bce43088cc50981838ca8f818bb5351f747f..dd6eeabbfe78ab2d7a1d866d1a16b84cd64331a3 100644 --- a/services/webapp/code/rosetta/base_app/views.py +++ b/services/webapp/code/rosetta/base_app/views.py @@ -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: