Use 'returncode' instead of 'failure' and 'error'

ome · Oct 18, 2023 · 760da8e · 760da8e
1 parent 659d4c5
commit 760da8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/omeroweb/webclient/templates/webclient/activities/activitiesContent.html b/omeroweb/webclient/templates/webclient/activities/activitiesContent.html
@@ -240,7 +240,7 @@
 								<img alt="Running Script" src="{% static "webgateway/img/spinner.gif" %}" />
 
 							{% else %} 
-								{% if j.error %} 
+								{% if j.returncode and j.returncode > 0 %}
                                 <div class='script_error' title="Script failed. Please see error logs">
                                     <img alt="Failed to run script properly" src="{% static "webgateway/img/failed.png" %}" />
                                 </div>

diff --git a/omeroweb/webclient/views.py b/omeroweb/webclient/views.py
@@ -3815,11 +3815,9 @@ def activities(request, conn=None, **kwargs):
                         results = proc.getResults(0, conn.SERVICE_OPTS)
                         kwargs = {
                             "status": "finished",
-                            "failure": cb.returncode,
+                            "returncode": cb.returncode,
                         }
                         if cb.returncode != 0:
-                            # This 'error' shows failure icon
-                            kwargs["error"] = 1
                             kwargs["Message"] = (
                                 f"Script exited with failure."
                                 f" (returncode={ cb.returncode })"