diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2019-09-05 11:27:25 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2019-09-05 11:27:25 +0100 |
| commit | 2b8e2e59e63bd5a44070300c507546444296bafc (patch) | |
| tree | 303d0efad0dce6a668abb76c9ad1800ad2a90541 | |
| parent | 658989458278ce83b626a7e622429c14e8111df8 (diff) | |
| parent | 0d7d04f3a2e893ffa15c5700c83f9d4f6b83f06f (diff) | |
Merge branch 'allow-undevolving'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Admin/Bodies.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/admin/bodies.t | 18 |
3 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ce0db9630..456be61d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ - Have duplicate suggestion and assets coexist better. - Don't include lat/lon of private reports in ‘Report another problem here’ link. + - Allow contact send method to be unset always. - Front end improvements: - Set report title autocomplete to off to prevent email autocompleting - Development improvements: diff --git a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm index 2ff69b3b5..67177fcbd 100644 --- a/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm +++ b/perllib/FixMyStreet/App/Controller/Admin/Bodies.pm @@ -241,7 +241,7 @@ sub update_contacts : Private { my $email = $c->get_param('email'); $email =~ s/\s+//g; - my $send_method = $c->get_param('send_method') || $contact->send_method || $contact->body->send_method || ""; + my $send_method = $c->get_param('send_method') || $contact->body->send_method || ""; unless ( $send_method eq 'Open311' ) { $errors{email} = _('Please enter a valid email') unless is_valid_email_list($email) || $email eq 'REFUSED'; } diff --git a/t/app/controller/admin/bodies.t b/t/app/controller/admin/bodies.t index db53b7cda..6fb13f0ff 100644 --- a/t/app/controller/admin/bodies.t +++ b/t/app/controller/admin/bodies.t @@ -182,6 +182,7 @@ subtest 'check open311 configuring' => sub { send_comments => 0, send_method => 'Open311', fetch_all_problems => 0, + can_be_devolved => 1, # for next test } } ); @@ -192,6 +193,23 @@ subtest 'check open311 configuring' => sub { ok !$conf->get_extra_metadata('fetch_all_problems'), 'fetch all problems unset'; }; +subtest 'check open311 devolved editing' => sub { + $mech->get_ok('/admin/body/' . $body->id . '/test%20category'); + $mech->submit_form_ok( { with_fields => { + send_method => 'Email', + email => 'testing@example.org', + note => 'Updating contact to email', + } } ); + $mech->content_contains('Values updated'); + $mech->get_ok('/admin/body/' . $body->id . '/test%20category'); + $mech->submit_form_ok( { with_fields => { + send_method => '', + email => 'open311-code', + note => 'Removing email send method', + } } ); + $mech->content_contains('Values updated'); +}; + subtest 'check text output' => sub { $mech->get_ok('/admin/body/' . $body->id . '?text=1'); is $mech->content_type, 'text/plain'; |