json for rpc result and error

r-map · Jan 16, 2024 · 913e38c · 913e38c
1 parent b7576b6
commit 913e38c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/python/rpc/models.py b/python/rpc/models.py
@@ -23,7 +23,15 @@ class Rpc(models.Model):
 
     def params_json(self):
         return json.dumps(self.params)
-
+
+    def result_json(self):
+        return json.dumps(self.result)
+
+    def error_json(self):
+        if self.error is None:
+            return _("OK")
+        return json.dumps(self.error)
+
     def status(self):
         if (self.datecmd is not None):
             if (self.dateres is not None):

diff --git a/python/rpc/templates/rpc/rpc_details.html b/python/rpc/templates/rpc/rpc_details.html
@@ -47,8 +47,8 @@ <h4>{% trans 'Station:' %} <a href="{% url 'rpcs-list' myrpc.stationmetadata.use
 	<td>{% trans 'Response' %}</td>
 	<td></td>
 	<td></td>
-	<td>{{ myrpc.result }}</td>
-	<td>{{ myrpc.error }}</td>
+	<td>{{ myrpc.result_json }}</td>
+	<td>{{ myrpc.error_json }}</td>
       </tr>
 
     </table>