3 files changed, 43 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 75684c773..8aac408e4 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -1083,6 +1083,7 @@ sub report_edit_location : Private {
         # comparison.
         my $safe_stash = { %{$c->stash} };
         $c->stash->{fetch_all_areas} = 1;
+        $c->stash->{area_check_action} = 'admin';
         $c->forward('/council/load_and_check_areas', []);
         $c->forward('/report/new/setup_categories_and_bodies');
         my %allowed_bodies = map { $_ => 1 } @{$problem->bodies_str_ids};
diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm
index d8fc38211..3b452e090 100644
--- a/perllib/FixMyStreet/App/Controller/Moderate.pm
+++ b/perllib/FixMyStreet/App/Controller/Moderate.pm
@@ -82,7 +82,9 @@ sub moderate_report : Chained('report') : PathPart('') : Args(0) {
             : ()),
         $c->forward('moderate_text', [ 'detail' ]),
         $c->forward('moderate_boolean', [ 'anonymous', 'show_name' ]),
-        $c->forward('moderate_boolean', [ 'photo' ]);
+        $c->forward('moderate_boolean', [ 'photo' ]),
+        $c->forward('moderate_location'),
+        $c->forward('moderate_extra');
 
     # Deal with possible photo changes. If a moderate form uses a standard
     # photo upload field (with upload_fileid, label and file upload handlers),
@@ -92,7 +94,8 @@ sub moderate_report : Chained('report') : PathPart('') : Args(0) {
     if ($photo_edit_form) {
         $c->forward('/photo/process_photo');
         if ( my $photo_error = delete $c->stash->{photo_error} ) {
-            $c->flash->{photo_error} = $photo_error;
+            $c->flash->{moderate_errors} ||= [];
+            push @{ $c->flash->{moderate_errors} }, $photo_error;
         } else {
             my $fileid = $c->stash->{upload_fileid};
             if ($fileid ne $problem->photo) {
@@ -230,6 +233,42 @@ sub moderate_boolean : Private {
     return;
 }
 
+sub moderate_extra : Private {
+    my ($self, $c) = @_;
+
+    my $object = $c->stash->{comment} || $c->stash->{problem};
+    my $changed;
+    my @extra = grep { /^extra\./ } keys %{$c->req->params};
+    foreach (@extra) {
+        my ($field_name) = /extra\.(.*)/;
+        my $old = $object->get_extra_metadata($field_name) || '';
+        my $new = $c->get_param($_);
+        if ($new ne $old) {
+            $object->set_extra_metadata($field_name, $new);
+            $changed = 1;
+        }
+    }
+    if ($changed) {
+        $object->update;
+        return 'extra';
+    }
+}
+
+sub moderate_location : Private {
+    my ($self, $c) = @_;
+
+    my $problem = $c->stash->{problem};
+    if ( !$c->forward( '/admin/report_edit_location', [ $problem ] ) ) {
+        # New lat/lon isn't valid, show an error
+        $c->flash->{moderate_errors} ||= [];
+        push @{ $c->flash->{moderate_errors} }, _('Invalid location. New location must be covered by the same council.');
+        return;
+    }
+
+    $problem->update;
+    return 'location';
+}
+
 sub update : Chained('report') : PathPart('update') : CaptureArgs(1) {
     my ($self, $c, $id) = @_;
     my $comment = $c->stash->{problem}->comments->find($id);
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index d4ff0a2ca..5718bc021 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 photo_error)) {
+        foreach (qw(alert_to_reporter anonymized moderate_errors)) {
             $c->stash->{$_} = $c->flash->{$_} if $c->flash->{$_};
         }
     }