task view improvements: show project neighborhood, remove ming I pref…

…ixes on args/kwargs
apache · Dec 13, 2024 · be0e3a6 · be0e3a6
1 parent 3a28d8f
commit be0e3a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
@@ -51,6 +51,7 @@
 from urllib.parse import urlparse
 import six
 
+from ming.odm.icollection import deinstrument
 
 log = logging.getLogger(__name__)
 
@@ -576,7 +577,12 @@ def view(self, task_id):
             task.app_config = M.AppConfig.query.get(
                 _id=task.context.app_config_id)
             task.user = M.User.query.get(_id=task.context.user_id)
-        return dict(task=task)
+            task_args = [deinstrument(a) for a in task.args]
+            task_kwargs = {k: deinstrument(v) for k,v in task.kwargs.items()}
+        else:
+            task_args = []
+            task_kwargs = {}
+        return dict(task=task, task_args=task_args, task_kwargs=task_kwargs)
 
     @expose('jinja:allura:templates/site_admin_task_new.html')
     @without_trailing_slash

diff --git a/Allura/allura/templates/site_admin_task_view.html b/Allura/allura/templates/site_admin_task_view.html
@@ -121,7 +121,7 @@ <h2>Task Details</h2>
         </tr>
         <tr>
             <th class="side-header">Project</th>
-            <td>{{ task.project.shortname if task.project }}</td>
+            <td>{{ task.project.url() if task.project }}</td>
             <td class="spacer"></td>
             <th class="second-column-headers side-header">Queued</th>
             <td>{{ task.time_queue.strftime('%Y/%m/%d %H:%M:%S') if task.time_queue }}</td>
@@ -147,16 +147,16 @@ <h2>Task Details</h2>
             <td class="second-column-headers"></td>
             <th>Keyword Args</th>
         </tr>
-        {% if task.args|length > task.kwargs|length %}
-            {% set indexes = range(task.args|length) %}
+        {% if task_args|length > task_kwargs|length %}
+            {% set indexes = range(task_args|length) %}
         {% else %}
-            {% set indexes = range(task.kwargs|length) %}
+            {% set indexes = range(task_kwargs|length) %}
         {% endif %}
-        {% set kwargs = task.kwargs.items()|list %}
+        {% set kwargs = task_kwargs.items()|list %}
         {% for i in indexes %}
         <tr>
             <td class="first-column-headers"></td>
-            <td>{{ task.args[i] }}</td>
+            <td>{{ task_args[i] }}</td>
             <td class="spacer"></td>
             {% if kwargs[i] %}
             <th class="second-column-headers side-header">{{ kwargs[i][0] }}</th>