diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-09-05 09:28:27 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-09-05 09:37:34 +0100 |
| commit | 37950c4077bfe9ef2f0b879cb4af74ffae278b47 (patch) | |
| tree | e6b700717e3afb1edc302bc406c56f42db048231 | |
| parent | 810dc52bee762bb9211041b4cb9e70386c783068 (diff) | |
display link to site for all visible states plus fix a few other hardcoded
states. fixes #154
| -rw-r--r-- | t/app/controller/admin.t | 6 | ||||
| -rw-r--r-- | templates/web/default/admin/problem_row.html | 9 |
2 files changed, 11 insertions, 4 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 4bfdd7821..25e921a4f 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -944,6 +944,12 @@ subtest 'report search' => sub { $mech->get_ok('/admin/search_reports?search=' . $report->user->email); $mech->content_like( qr{<tr [^>]*hidden[^>]*> \s* <td> \s* $r_id \s* </td>}xs ); + + $report->state('fixed - user'); + $report->update; + + $mech->get_ok('/admin/search_reports?search=' . $report->user->email); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id/">$r_id</a>} ); }; subtest 'search abuse' => sub { 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> |