diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2013-01-15 16:37:57 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2013-01-15 16:37:57 +0000 |
| commit | 69bcc1d99421a333a0ac8e764b1d259ffe24e5a3 (patch) | |
| tree | d32120673433e509dc3b1d0d416171694f9e6294 /perllib/FixMyStreet | |
| parent | ee6c5edc9252effe4b056cdea77db8efe08af314 (diff) | |
Store Zurich external body in external_body rather than changing bodies_str.
Diffstat (limited to 'perllib/FixMyStreet')
| -rw-r--r-- | perllib/FixMyStreet/Cobrand/Zurich.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 6 | ||||
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Zurich.pm | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm index 4846e6f1e..b6e582dc2 100644 --- a/perllib/FixMyStreet/Cobrand/Zurich.pm +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -211,7 +211,7 @@ sub admin_report_edit { $redirect = 1; } elsif ( my $external = $c->req->params->{body_external} ) { $problem->state( 'closed' ); - $problem->bodies_str( $external ); + $problem->external_body( $external ); $problem->whensent( undef ); $redirect = 1; } else { diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 1a13ca2f4..20b79167f 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -557,7 +557,11 @@ sub body { my ( $problem, $c ) = @_; my $body; if ($problem->external_body) { - $body = $problem->external_body; + if ($problem->cobrand eq 'zurich') { + $body = $c->model('DB::Body')->find({ id => $problem->external_body }); + } else { + $body = $problem->external_body; + } } else { my $bodies = $problem->bodies; $body = join( _(' and '), diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm index 7bf6fe1a3..ca9e6f33e 100644 --- a/perllib/FixMyStreet/SendReport/Zurich.pm +++ b/perllib/FixMyStreet/SendReport/Zurich.pm @@ -9,6 +9,8 @@ sub build_recipient_list { # Only one body ever, most of the time with an email endpoint my $body = @{ $self->bodies }[0]; + $body = FixMyStreet::App->model("DB::Body")->find( { id => $row->external_body } ) + if $row->external_body; my $body_email = $body->endpoint; my @bodies = $body->bodies; |