1 files changed, 32 insertions, 34 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm
index 85b6204fc..253840082 100644
--- a/perllib/FixMyStreet/App/Controller/Admin.pm
+++ b/perllib/FixMyStreet/App/Controller/Admin.pm
@@ -780,24 +780,10 @@ sub update_user : Private {
     return 0;
 }
 
-sub report_edit : Path('report_edit') : Args(1) {
-    my ( $self, $c, $id ) = @_;
-
-    my $problem = $c->cobrand->problems->search( { id => $id } )->first;
-
-    $c->detach( '/page_error_404_not_found', [] )
-      unless $problem;
-
-    unless (
-        $c->cobrand->moniker eq 'zurich'
-        || $c->user->has_permission_to(report_edit => $problem->bodies_str_ids)
-    ) {
-        $c->detach( '/page_error_403_access_denied', [] );
-    }
-
-    $c->stash->{problem} = $problem;
+sub report_edit_display : Private {
+    my ( $self, $c ) = @_;
 
-    $c->forward('/auth/get_csrf_token');
+    my $problem = $c->stash->{problem};
 
     $c->stash->{page} = 'admin';
     FixMyStreet::Map::display_map(
@@ -814,27 +800,29 @@ sub report_edit : Path('report_edit') : Args(1) {
         : [],
         print_report => 1,
     );
+}
 
-    if (my $rotate_photo_param = $self->_get_rotate_photo_param($c)) {
-        $self->rotate_photo($c, $problem, @$rotate_photo_param);
-        if ( $c->cobrand->moniker eq 'zurich' ) {
-            # Clicking the photo rotation buttons should do nothing
-            # except for rotating the photo, so return the user
-            # to the report screen now.
-            $c->res->redirect( $c->uri_for( 'report_edit', $problem->id ) );
-            return;
-        } else {
-            return 1;
-        }
-    }
+sub report_edit : Path('report_edit') : Args(1) {
+    my ( $self, $c, $id ) = @_;
 
-    $c->forward('categories_for_point');
+    my $problem = $c->cobrand->problems->search( { id => $id } )->first;
 
-    if ( $c->cobrand->moniker eq 'zurich' ) {
-        my $done = $c->cobrand->admin_report_edit();
-        return if $done;
+    $c->detach( '/page_error_404_not_found', [] )
+      unless $problem;
+
+    unless (
+        $c->cobrand->moniker eq 'zurich'
+        || $c->user->has_permission_to(report_edit => $problem->bodies_str_ids)
+    ) {
+        $c->detach( '/page_error_403_access_denied', [] );
     }
 
+    $c->stash->{problem} = $problem;
+
+    $c->forward('/auth/get_csrf_token');
+
+    $c->forward('categories_for_point');
+
     $c->forward('check_username_for_abuse', [ $problem->user ] );
 
     $c->stash->{updates} =
@@ -842,6 +830,16 @@ sub report_edit : Path('report_edit') : Args(1) {
           ->search( { problem_id => $problem->id }, { order_by => 'created' } )
           ->all ];
 
+    if (my $rotate_photo_param = $self->_get_rotate_photo_param($c)) {
+        $self->rotate_photo($c, $problem, @$rotate_photo_param);
+        $c->detach('report_edit_display');
+    }
+
+    if ( $c->cobrand->moniker eq 'zurich' ) {
+        my $done = $c->cobrand->admin_report_edit();
+        $c->detach('report_edit_display') if $done;
+    }
+
     if ( $c->get_param('resend') ) {
         $c->forward('/auth/check_csrf_token');
 
@@ -937,7 +935,7 @@ sub report_edit : Path('report_edit') : Args(1) {
         $problem->discard_changes;
     }
 
-    return 1;
+    $c->detach('report_edit_display');
 }
 
 =head2 report_edit_category