Commit 7e246d98 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixes in case of non existent computing confs.

parent 6e4f63bb

services/webapp/code/rosetta/base_app/templates/edit_computing_conf.html

+1 −3
Original line number Diff line number Diff line
@@ -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>

services/webapp/code/rosetta/base_app/views.py

+7 −5
Original line number Diff line number Diff line
@@ -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:
@@ -786,6 +786,7 @@ def edit_computing_conf(request): 
            data['saved'] = True



        # 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,6 +812,7 @@ def edit_computing_conf(request): 
            data['saved'] = True

        

        # Dump conf data for the webpage

        if computingUserConf.data:

            data['computing_conf_data'] = json.dumps(computingUserConf.data)