diff options
| author | Hakim Cassimally <hakim@mysociety.org> | 2015-02-27 15:34:24 +0000 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2015-10-06 09:09:24 +0100 |
| commit | e7c35a0de101331436b1d5d6f2346a8c85233737 (patch) | |
| tree | 895462731355a23da52c5d504c59871c9342a426 /perllib/FixMyStreet/SendReport | |
| parent | 34f3f5a36b6773ad51060256d4e95efd7c45b3c8 (diff) | |
[Zurich] admin workflow changes available states
See mysociety/FixMyStreet-Commercial#690
- external_message for Extern/Wunsch states
- as per PDF mockups, the "public response" field is now editable
from more states, namely:
- Ruckmeldung ausstehend
- Extern
- Zustandigkeit unbekannt
- Wunsch
- Nicht kontaktierbar
- Unsichtbar
- test fixes
NB: slight hack to reorder Zurich report_display tests
As these remove 'investigating' from hidden_states, these break
tests for default cobrand (the FMS::App code expects to be called
once on request start, not multiple times within one test)
- Not contactable button
and tests for this and the similar `send_back` functionality
(previously untested).
NB: Unsure why we need to specify form_number=2 just for these submits,
but test won't find the buttons otherwise.
- Make sure SDMs' "time_spent" figure is recorded.
(See mysociety/FixMyStreet-Commercial#718)
Diffstat (limited to 'perllib/FixMyStreet/SendReport')
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Zurich.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm index 40417b41e..a5df06ee3 100644 --- a/perllib/FixMyStreet/SendReport/Zurich.pm +++ b/perllib/FixMyStreet/SendReport/Zurich.pm @@ -12,6 +12,7 @@ sub build_recipient_list { if ( $row->external_body ) { $body = FixMyStreet::App->model("DB::Body")->find( { id => $row->external_body } ); $h->{bodies_name} = $body->name; + $h->{external_message} = $row->get_extra_metadata('external_message') || ''; } my $body_email = $body->endpoint; @@ -39,6 +40,8 @@ sub get_template { $template = 'submit-in-progress.txt'; } elsif ( $row->state eq 'planned' ) { $template = 'submit-feedback-pending.txt'; + } elsif ( $row->state eq 'investigating' ) { + $template = 'submit-external-wish.txt'; } elsif ( $row->state eq 'closed' ) { $template = 'submit-external.txt'; if ( $row->extra->{third_personal} ) { |