diff options
| author | Dave Arter <davea@mysociety.org> | 2016-11-22 13:04:25 +0000 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2016-12-13 16:31:10 +0000 |
| commit | ec6389940afce877a0bc7771d11a27ee7183f96a (patch) | |
| tree | faac683c3d9a5ec56b9e54d8913742f1169f0f5e /perllib/FixMyStreet | |
| parent | 05ba5147de9dc7b68f3c9048771fcabf80f20eca (diff) | |
Make it clearer that report is closed when marked as duplicate
- Record state change when leaving update and marking as duplicate
- Change save button wording to match problem state when inspecting
- Make it clearer that updates marking a report as duplicate actually close the report
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 154f0ac94..f7ccddc70 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -314,6 +314,7 @@ sub inspect : Private { my $valid = 1; my $update_text; my $reputation_change = 0; + my %update_params = (); if ($permissions->{report_inspect}) { foreach (qw/detailed_information traffic_information duplicate_of/) { @@ -341,6 +342,11 @@ sub inspect : Private { if ( $problem->state eq 'hidden' ) { $problem->get_photoset->delete_cached; } + if ( $problem->state eq 'duplicate' && $old_state ne 'duplicate' ) { + # If the report is being closed as duplicate, make sure the + # update records this. + $update_params{problem_state} = "duplicate"; + } if ( $problem->state ne 'duplicate' ) { $problem->unset_extra_metadata('duplicate_of'); } @@ -388,6 +394,7 @@ sub inspect : Private { state => 'confirmed', mark_fixed => 0, anonymous => 0, + %update_params, } ); } # This problem might no longer be visible on the current cobrand, |