diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2015-09-28 18:04:01 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2015-09-28 18:04:01 +0100 |
| commit | 9af214f26c2b10832977d715629e9e0fbf4ad349 (patch) | |
| tree | 7222c4e4ab91224b80fc88a5c3a97f1bb43289d0 | |
| parent | a428c23753694794f3b1bddace94e869c2d7550f (diff) | |
| parent | a8eb8d3a3a1df337a1ebc73adf56f243de31d9e5 (diff) | |
Merge remote-tracking branch 'origin/blank-questionnaire-text'
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/Questionnaire.pm | 2 | ||||
| -rw-r--r-- | t/app/controller/questionnaire.t | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index 035cab3a6..8fe2514c0 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -234,6 +234,8 @@ sub process_questionnaire : Private { map { $c->stash->{$_} = $c->get_param($_) || '' } qw(been_fixed reported another update); + $c->stash->{update} = Utils::cleanup_text($c->stash->{update}, { allow_multiline => 1 }); + # EHA questionnaires done for you if ($c->cobrand->moniker eq 'emptyhomes') { $c->stash->{another} = $c->stash->{num_questionnaire}==1 ? 'Yes' : 'No'; diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t index 14d834078..d4fc9c74b 100644 --- a/t/app/controller/questionnaire.t +++ b/t/app/controller/questionnaire.t @@ -191,6 +191,16 @@ foreach my $test ( }, }, { + desc => 'Fixed report, reopened, reported before, blank update, no further questionnaire', + problem_state => 'fixed', + fields => { + been_fixed => 'No', + reported => 'Yes', + another => 'No', + update => ' ', + }, + }, + { desc => 'Closed report, said fixed, reported before, no update, no further questionnaire', problem_state => 'closed', fields => { |