File tree Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Expand file tree Collapse file tree 2 files changed +13
-7
lines changed Original file line number Diff line number Diff line change 51
51
from urllib .parse import urlparse
52
52
import six
53
53
54
+ from ming .odm .icollection import deinstrument
54
55
55
56
log = logging .getLogger (__name__ )
56
57
@@ -576,7 +577,12 @@ def view(self, task_id):
576
577
task .app_config = M .AppConfig .query .get (
577
578
_id = task .context .app_config_id )
578
579
task .user = M .User .query .get (_id = task .context .user_id )
579
- return dict (task = task )
580
+ task_args = [deinstrument (a ) for a in task .args ]
581
+ task_kwargs = {k : deinstrument (v ) for k ,v in task .kwargs .items ()}
582
+ else :
583
+ task_args = []
584
+ task_kwargs = {}
585
+ return dict (task = task , task_args = task_args , task_kwargs = task_kwargs )
580
586
581
587
@expose ('jinja:allura:templates/site_admin_task_new.html' )
582
588
@without_trailing_slash
Original file line number Diff line number Diff line change @@ -121,7 +121,7 @@ <h2>Task Details</h2>
121
121
</ tr >
122
122
< tr >
123
123
< th class ="side-header "> Project</ th >
124
- < td > {{ task.project.shortname if task.project }}</ td >
124
+ < td > {{ task.project.url() if task.project }}</ td >
125
125
< td class ="spacer "> </ td >
126
126
< th class ="second-column-headers side-header "> Queued</ th >
127
127
< td > {{ task.time_queue.strftime('%Y/%m/%d %H:%M:%S') if task.time_queue }}</ td >
@@ -147,16 +147,16 @@ <h2>Task Details</h2>
147
147
< td class ="second-column-headers "> </ td >
148
148
< th > Keyword Args</ th >
149
149
</ tr >
150
- {% if task.args |length > task.kwargs |length %}
151
- {% set indexes = range(task.args |length) %}
150
+ {% if task_args |length > task_kwargs |length %}
151
+ {% set indexes = range(task_args |length) %}
152
152
{% else %}
153
- {% set indexes = range(task.kwargs |length) %}
153
+ {% set indexes = range(task_kwargs |length) %}
154
154
{% endif %}
155
- {% set kwargs = task.kwargs .items()|list %}
155
+ {% set kwargs = task_kwargs .items()|list %}
156
156
{% for i in indexes %}
157
157
< tr >
158
158
< td class ="first-column-headers "> </ td >
159
- < td > {{ task.args [i] }}</ td >
159
+ < td > {{ task_args [i] }}</ td >
160
160
< td class ="spacer "> </ td >
161
161
{% if kwargs[i] %}
162
162
< th class ="second-column-headers side-header "> {{ kwargs[i][0] }}</ th >
You can’t perform that action at this time.
0 commit comments