diff options
Diffstat (limited to 'perllib')
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Moderate.pm | 25 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report.pm | 5 | ||||
| -rw-r--r-- | perllib/FixMyStreet/TestMech.pm | 11 |
3 files changed, 28 insertions, 13 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm index c47c34f37..d8fc38211 100644 --- a/perllib/FixMyStreet/App/Controller/Moderate.pm +++ b/perllib/FixMyStreet/App/Controller/Moderate.pm @@ -69,19 +69,40 @@ sub report : Chained('moderate') : PathPart('report') : CaptureArgs(1) { sub moderate_report : Chained('report') : PathPart('') : Args(0) { my ($self, $c) = @_; + my $problem = $c->stash->{problem}; + # Make sure user can moderate this report - $c->detach unless $c->user->can_moderate($c->stash->{problem}); + $c->detach unless $c->user->can_moderate($problem); $c->forward('report_moderate_hide'); my @types = grep $_, - ($c->user->can_moderate_title($c->stash->{problem}, 1) + ($c->user->can_moderate_title($problem, 1) ? $c->forward('moderate_text', [ 'title' ]) : ()), $c->forward('moderate_text', [ 'detail' ]), $c->forward('moderate_boolean', [ 'anonymous', 'show_name' ]), $c->forward('moderate_boolean', [ 'photo' ]); + # Deal with possible photo changes. If a moderate form uses a standard + # photo upload field (with upload_fileid, label and file upload handlers), + # this will allow photos to be changed, not just switched on/off. You will + # probably want a hidden field with problem_photo=1 to skip that check. + my $photo_edit_form = defined $c->get_param('photo1'); + if ($photo_edit_form) { + $c->forward('/photo/process_photo'); + if ( my $photo_error = delete $c->stash->{photo_error} ) { + $c->flash->{photo_error} = $photo_error; + } else { + my $fileid = $c->stash->{upload_fileid}; + if ($fileid ne $problem->photo) { + $problem->get_photoset->delete_cached; + $problem->update({ photo => $fileid || undef }); + push @types, 'photo'; + } + } + } + $c->detach( 'report_moderate_audit', \@types ) } diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 198edb5f7..d4ff0a2ca 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -194,7 +194,7 @@ sub load_updates : Private { $c->stash->{updates} = \@combined; if ($c->sessionid) { - foreach (qw(alert_to_reporter anonymized)) { + foreach (qw(alert_to_reporter anonymized photo_error)) { $c->stash->{$_} = $c->flash->{$_} if $c->flash->{$_}; } } @@ -207,6 +207,9 @@ sub format_problem_for_display : Private { my $problem = $c->stash->{problem}; + # upload_fileid is used by the update form on this page + $c->stash->{problem_upload_fileid} = $problem->get_photoset->data; + ( $c->stash->{latitude}, $c->stash->{longitude} ) = map { Utils::truncate_coordinate($_) } ( $problem->latitude, $problem->longitude ); diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index e7fc573c0..495310063 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -706,7 +706,7 @@ sub create_problems_for_body { latitude => '51.5016605453401', longitude => '-0.142497580865087', user_id => $user->id, - photo => $mech->get_photo_data, + photo => '74e3362283b6ef0c48686fb0e161da4043bbcc97.jpeg', }; my %report_params = ( %$default_params, %$params ); @@ -721,15 +721,6 @@ sub create_problems_for_body { return @problems; } -sub get_photo_data { - my $mech = shift; - return $mech->{sample_photo} ||= do { - my $sample_file = FixMyStreet->path_to( 't/app/controller/sample.jpg' ); - $mech->builder->ok( -f "$sample_file", "sample file $sample_file exists" ); - $sample_file->slurp(iomode => '<:raw'); - }; -} - sub create_comment_for_problem { my ( $mech, $problem, $user, $name, $text, $anonymous, $state, $problem_state, $params ) = @_; $params ||= {}; |