[Zurich] Make sure external/competent body message is saved

 - Only send external_message when the problem state has the correct value
 - But make sure the message is preserved for editing when problem state is 'planned'

See mysociety/FixMyStreet-Commercial#718

1 files changed, 5 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm
index 075e9dd9c..882e6a5bc 100644
--- a/perllib/FixMyStreet/Cobrand/Zurich.pm
+++ b/perllib/FixMyStreet/Cobrand/Zurich.pm
@@ -679,6 +679,10 @@ sub admin_report_edit {
                     $redirect = 1;
                     $closed++;
                 }
+                # set the external_message in extra, so that it can be edited again
+                if ( my $external_message = $c->req->params->{external_message} ) {
+                    $problem->set_extra_metadata( external_message => $external_message );
+                }
                 # else should really return a message here
             }
             elsif ($c->req->params->{publish_response}) {
@@ -721,7 +725,7 @@ sub admin_report_edit {
         # send external_message if provided and state is *now* Wish|Extern
         # e.g. was already, or was set in the Rueckmeldung ausstehend clause above.
         if ( my $external_message = $c->req->params->{external_message}
-             and $problem->state =~ /^(closed|investigating)$/) 
+             and $problem->state =~ /^(closed|investigating)$/)
         {
             my $external = $problem->external_body;
             my $external_body = $c->model('DB::Body')->find($external)