Move no more updates code within normal submission, in case they leave a final update at the same time.

1 files changed, 8 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 4eedc1249..321041b92 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -236,15 +236,6 @@ sub admin_report_edit {
             # log here
             $c->res->redirect( '/admin/summary' );
 
-        } elsif ($c->req->param('no_more_updates')) {
-            $c->forward('check_token');
-
-            $problem->bodies_str( $body->parent->id );
-            $problem->state( 'planned' );
-            $problem->update;
-            # log here
-            $c->res->redirect( '/admin/summary' );
-
         } elsif ($c->req->param('submit')) {
             $c->forward('check_token');
 
@@ -271,6 +262,14 @@ sub admin_report_edit {
 
             $c->stash->{status_message} = '<p><em>' . _('Updated!') . '</em></p>';
 
+            # If they clicked the no more updates button, we're done.
+            if ($c->req->param('no_more_updates')) {
+                $problem->bodies_str( $body->parent->id );
+                $problem->state( 'planned' );
+                $problem->update;
+                # log here
+                $c->res->redirect( '/admin/summary' );
+            }
         }
 
         $c->stash->{updates} = [ $c->model('DB::Comment')