diff options
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Comment.pm | 6 | ||||
| -rw-r--r-- | t/app/controller/report_updates.t | 2 | ||||
| -rw-r--r-- | templates/web/base/admin/report_blocks.html | 2 | ||||
| -rw-r--r-- | templates/web/base/report/update/form_update.html | 2 | ||||
| -rw-r--r-- | templates/web/bromley/report/update-form.html | 2 |
5 files changed, 6 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index fb41bc7f0..a15400cc1 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -281,7 +281,7 @@ sub meta_line { } elsif ($state eq 'fixed') { $update_state = _( 'marked as fixed' ) } elsif ($state eq 'unable to fix') { - $update_state = _( 'marked as unable to fix' ) + $update_state = _( 'marked as no further action' ) } elsif ($state eq 'not responsible') { $update_state = _( "marked as not the council's responsibility" ) } elsif ($state eq 'duplicate') { @@ -291,9 +291,7 @@ sub meta_line { } if ($c->cobrand->moniker eq 'bromley' || $self->problem->bodies_str eq '2482') { - if ($state eq 'unable to fix') { - $update_state = 'marked as no further action'; - } elsif ($state eq 'not responsible') { + if ($state eq 'not responsible') { $update_state = 'marked as third party responsibility' } } diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 6fc7bb8e1..41d181e65 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -594,7 +594,7 @@ for my $test ( name => $user->name, may_show_name => 1, update => 'Set state to unable to fix', - state => 'unable to fix', + state => 'no further action', }, state => 'unable to fix', }, diff --git a/templates/web/base/admin/report_blocks.html b/templates/web/base/admin/report_blocks.html index 1dd4c9dd0..9231dd1c2 100644 --- a/templates/web/base/admin/report_blocks.html +++ b/templates/web/base/admin/report_blocks.html @@ -11,7 +11,7 @@ SET state_pretty = { 'fixed' = loc('Fixed') 'fixed - user' = loc('Fixed - User') 'fixed - council' = loc('Fixed - Council') - 'unable to fix' = loc('Unable to fix') + 'unable to fix' = loc('No further action') 'not responsible' = loc('Not Responsible') 'duplicate' = loc('Duplicate') 'closed' = loc('Closed') diff --git a/templates/web/base/report/update/form_update.html b/templates/web/base/report/update/form_update.html index a3d4615e1..e0464eec3 100644 --- a/templates/web/base/report/update/form_update.html +++ b/templates/web/base/report/update/form_update.html @@ -41,7 +41,7 @@ [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['action scheduled', loc('Action Scheduled')], ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], - ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], + ['unable to fix', loc('No further action')], ['not responsible', loc('Not Responsible')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option> [% END %] diff --git a/templates/web/bromley/report/update-form.html b/templates/web/bromley/report/update-form.html index 112cb2960..99f8248e3 100644 --- a/templates/web/bromley/report/update-form.html +++ b/templates/web/bromley/report/update-form.html @@ -51,7 +51,7 @@ [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating', loc('Investigating')], ['action scheduled', loc('Action Scheduled')], ['in progress', loc('In Progress')], ['duplicate', loc('Duplicate')], - ['unable to fix', loc('Unable to fix')], ['not responsible', loc('Not Responsible')], + ['unable to fix', loc('No further action')], ['not responsible', loc('Not Responsible')], ['fixed', loc('Fixed')] ] %] <option [% 'selected ' IF state.0 == problem.state_display %] value="[% state.0 %]">[% state.1 %]</option> [% END %] |