diff options
| author | Marius Halden <marius.h@lden.org> | 2015-11-16 11:15:10 +0100 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2015-11-16 11:15:10 +0100 |
| commit | 1339a64632c441e4d7858bd5946738c9840c624d (patch) | |
| tree | 0b1393ca9af05d1af690fbf6c569c195f4136e4c /templates/web/zurich/admin/problem_row.html | |
| parent | 17cc40a8a2387669984ae4a36bb0d30d889d1a07 (diff) | |
| parent | 4fb5331abd2fa4c89ebeb89bc92a245fadd0aa19 (diff) | |
Merge branch 'fiksgatami-dev' into fiksgatami-prod
Oppgrader prod til 1.7
Diffstat (limited to 'templates/web/zurich/admin/problem_row.html')
| -rw-r--r-- | templates/web/zurich/admin/problem_row.html | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/templates/web/zurich/admin/problem_row.html b/templates/web/zurich/admin/problem_row.html index 9b395a1ac..baa8d3ac7 100644 --- a/templates/web/zurich/admin/problem_row.html +++ b/templates/web/zurich/admin/problem_row.html @@ -18,7 +18,9 @@ <td>[% PROCESS value_or_nbsp value=problem.category %]</td> <td>[% PROCESS format_date this_date=problem.created %]</td> <td>[% PROCESS format_date this_date=problem.lastupdate %]</td> - <td>[% states.${problem.state} %]</td> + <td> [% states.${problem.state} %][% IF problem.state == 'planned'; + SET cs=problem.get_extra_metadata('closure_status'); + IF cs %] ([% states.$cs %]) [% END; END %]</td> [% IF include_subdiv %] <td> @@ -34,7 +36,11 @@ <td> [% IF problem.photo %] - <img class="img" height="60" width="90" src="[% c.cobrand.base_url %]/photo/[% problem.photo %].temp.jpeg" alt=""> + [% FOR photo IN problem.get_photoset(c).images %] + <div class="update-img"> + <img height="60" width="90" alt="" src="[% c.cobrand.base_url %]/photo/[% photo.0 %].temp.jpeg"> + </div> + [% END %] [% END %] </td> |