diff options
Diffstat (limited to 'templates/web/zurich')
| -rw-r--r-- | templates/web/zurich/admin/index-dm.html | 6 | ||||
| -rw-r--r-- | templates/web/zurich/admin/problem_row.html | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/templates/web/zurich/admin/index-dm.html b/templates/web/zurich/admin/index-dm.html index 1286861bc..a88100ee4 100644 --- a/templates/web/zurich/admin/index-dm.html +++ b/templates/web/zurich/admin/index-dm.html @@ -10,7 +10,7 @@ [% INCLUDE list, problems = approval.all %] <h2>[% loc('All reports') %]</h2> -[% INCLUDE list, problems = other.all %] +[% INCLUDE list, problems = other.all, include_subdiv = 1 %] [% INCLUDE 'admin/footer.html' %] @@ -23,7 +23,9 @@ <th>[% loc('Submitted') %]</th> <th>[% loc('Updated') %]</th> <th>[% loc('Status') %]</th> - <th>[% loc('Subdivision') %]</th> + [% IF include_subdiv %] + <th>[% loc('Subdivision/Body') %]</th> + [% END %] <th>*</th> </tr> <tr class="filter-row"> diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index 7fddddf8e..176f1a1a6 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -1,6 +1,6 @@ [%- FOR problem IN problems %] + [% SET p_body = problem.bodies.values.0 %] [% IF page == 'search' %] - [% SET p_body = problem.bodies.values.0 %] [% NEXT IF admin_type == 'sdm' AND p_body.id != body.id %] [% NEXT IF admin_type == 'dm' AND p_body.id != body.id AND p_body.parent.id != body.id %] [% END %] @@ -15,15 +15,19 @@ <td>[% PROCESS format_date this_date=problem.created %]</td> <td>[% PROCESS format_date this_date=problem.lastupdate %]</td> <td>[% states.${problem.state} %]</td> - [% IF admin_type != 'sdm' %] + + [% IF include_subdiv %] <td> - [%- IF p_body.parent.id AND p_body.parent.parent.id -%][%# ...it's a subdivision %] + [%- IF p_body.parent.parent.id -%][%# ...it's a subdivision %] [% PROCESS value_or_nbsp value=p_body.name %] + [%- ELSIF problem.external_body %] + [% PROCESS value_or_nbsp value=problem.body(c).name %] [%- ELSE -%] [%- END -%] </td> [% END %] + [% IF NOT no_edit %] <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td> [% END %] |