diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-09-05 16:59:05 +0100 |
| commit | eb823376088f47abf23050a0193225a45b51d6d3 (patch) | |
| tree | a6eb5fc8cf694a7dd70d7d1a957d65ec09a6c60a /templates/web/default/admin | |
| parent | bc39723b98a0bb07cc8d57e99489e3a014d857ef (diff) | |
| parent | 7fc1083eb431312a59758c473e8ff52ceb8585ef (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into js-validation
Conflicts:
templates/web/default/common_header_tags.html
Diffstat (limited to 'templates/web/default/admin')
| -rw-r--r-- | templates/web/default/admin/problem_row.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 664ff1b13..22825429a 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -1,6 +1,6 @@ [%- FOR problem IN problems %] <tr[% ' class="hidden"' IF problem.state == 'hidden' %]> - <td>[%- IF problem.state == 'confirmed' || problem.state == 'fixed' -%] + <td>[%- IF problem.is_visible -%] [%- cobrand_data = problem.cobrand_data %] [%- cobrand_data = c.data_for_generic_problem IF !problem.cobrand %] <a href="[% c.uri_for_email( '/report', problem.id, cobrand_data ) %]">[% problem.id %]</a> @@ -20,9 +20,10 @@ <td>[% problem.cobrand %]<br>[% problem.cobrand_data | html %]</td> <td>[% PROCESS format_time time=problem.created %]</td> <td>[% problem.state %]<small> - [%- IF problem.state == 'fixed' || problem.state == 'confirmed' %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] - [%- IF problem.state == 'fixed' %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] - [%- IF problem.state == 'confirmed' %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> + [%- IF problem.is_visible %]<br>[% loc('Confirmed:' ) %] [% PROCESS format_time time=problem.confirmed %][% END -%] + [%- IF problem.is_fixed %]<br>[% loc('Fixed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + [%- IF problem.is_closed %]<br>[% loc('Closed:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%] + [%- IF problem.is_open %]<br>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %][% END -%]</small> </td> <td>[% PROCESS format_time time=problem.whensent %]</td> <td><a href="[% c.uri_for( 'report_edit', problem.id ) %]">[% loc('Edit') %]</a></td> |