Fixes in computing resource configurations viewing/editing.

services/webapp/code/rosetta/core_app/templates/components/computing.html

@@ -22,12 +22,12 @@
 
        <tr>
         <td><b>Sys Conf</b></td>
-        <td>{{ computing.sys_conf_data }} {% if request.user.is_superuser %} &nbsp;[<a href="/edit_computing_conf?type=sys&computing_uuid={{ computing.uuid}}">Edit</a>] {% endif %}</td>
+        <td>{{ computing.sys_conf_data_json }} {% if request.user.is_superuser %} &nbsp;[<a href="/edit_computing_conf?type=sys&computing_uuid={{ computing.uuid}}">Edit</a>] {% endif %}</td>
        </tr>
 
        <tr>
         <td><b>User Conf</b></td>
-        <td>{{ computing.user_conf_data }} &nbsp;[<a href="/edit_computing_conf?type=user&computing_uuid={{ computing.uuid}}">Edit</a>]</td>
+        <td>{{ computing.user_conf_data_json }} &nbsp;[<a href="/edit_computing_conf?type=user&computing_uuid={{ computing.uuid}}">Edit</a>]</td>
        </tr>
 
        

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

@@ -24,7 +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_json}}</textarea>
         </td>
        </tr>
 

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

@@ -780,7 +780,10 @@ def computings(request):
     data['computings'] = list(Computing.objects.filter(user=None)) + list(Computing.objects.filter(user=request.user))
     # Attach user conf in any
     for computing in data['computings']:
-        computing.attach_user_conf_data(request.user) 
+        computing.attach_user_conf_data(request.user)
+        computing.user_conf_data_json = json.dumps(computing.user_conf_data)
+        computing.sys_conf_data_json = json.dumps(computing.sys_conf_data)
+
 
     return render(request, 'computings.html', {'data': data})
 
@@ -857,7 +860,8 @@ def edit_computing_conf(request):
 
         # Dump conf data for the webpage
         if computingSysConf.data:
-            data['computing_conf_data'] = json.dumps(computingSysConf.data)
+            data['computing_conf_data'] = computingSysConf.data
+            data['computing_conf_data_json'] = json.dumps(computingSysConf.data)
     
     elif computing_conf_type == 'user':
 
@@ -883,7 +887,8 @@ def edit_computing_conf(request):
         
         # Dump conf data for the webpage
         if computingUserConf.data:
-            data['computing_conf_data'] = json.dumps(computingUserConf.data)
+            data['computing_conf_data'] = computingUserConf.data
+            data['computing_conf_data_json'] = json.dumps(computingUserConf.data)
 
            
     else: