diff options
| author | Dave Arter <davea@mysociety.org> | 2018-02-22 15:40:10 +0000 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2018-03-14 13:32:37 +0000 |
| commit | 14570b18dd96d06f4b7c2aa11fade34aa8f06dad (patch) | |
| tree | 304130825844fc25a29982a233a62234aac89150 | |
| parent | fc172603a4061f33c5e6796e8375e01b7c814111 (diff) | |
Display ‘pick an option’ placeholder for report extra dropdowns
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | t/app/controller/report_new_open311.t | 5 | ||||
| -rw-r--r-- | templates/web/base/report/new/category_extras_fields.html | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ff3d28d7a..fdfad3359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Improve questionnaire process. #1939 #1998 - Increase size of "sub map links" (hide pins, permalink, etc) #2003 - Edge-to-edge email layout on narrow screens #2010 + - Add default placeholder to report extra fields. #2027 - Bugfixes: - Stop asset layers obscuring marker layer. #1999 - Don't delete hidden field values when inspecting reports. #1999 diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t index 0224e7e47..d79f7883c 100644 --- a/t/app/controller/report_new_open311.t +++ b/t/app/controller/report_new_open311.t @@ -64,7 +64,7 @@ foreach my $test ( }, changes => { number => '', - type => 'old', + type => '', }, errors => [ 'This information is required', @@ -80,6 +80,7 @@ foreach my $test ( username => 'testopen311@example.com', category => 'Street lighting', number => 27, + type => 'old', }, extra => [ { @@ -146,7 +147,7 @@ foreach my $test ( } ->scrape( $mech->response ); - is_deeply $result->{option}, [ qw/old modern/], 'displayed streetlight type select'; + is_deeply $result->{option}, [ "", qw/old modern/], 'displayed streetlight type select'; } $new_values = { diff --git a/templates/web/base/report/new/category_extras_fields.html b/templates/web/base/report/new/category_extras_fields.html index ca5cb1461..6ed6391c7 100644 --- a/templates/web/base/report/new/category_extras_fields.html +++ b/templates/web/base/report/new/category_extras_fields.html @@ -14,6 +14,7 @@ [% IF meta.variable != 'false' %] [% IF meta.exists('values') %] <select class="form-control" name="[% cat_prefix %][% meta_name %]" id="[% cat_prefix %]form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + <option value="">[% loc('-- Pick an option --') %]</option> [% FOR option IN meta.values %] <option value="[% option.key %]"[% IF option.key == report_meta.$meta_name.value %] selected[% END %]>[% option.name %]</option> [% END %] |