diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Report/New.pm | 2 | ||||
| -rw-r--r-- | templates/web/default/report/new/category_extras.html | 4 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/new/category_extras.html | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index a2c5e6a0c..2318ee9e1 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -884,7 +884,7 @@ sub process_report : Private { $c->cobrand->process_extras( $c, $contacts[0]->area_id, \@extra ); if ( @extra ) { - $c->stash->{report_meta} = \@extra; + $c->stash->{report_meta} = { map { $_->{name} => $_ } @extra }; $report->extra( \@extra ); } } elsif ( @{ $c->stash->{area_ids_to_list} } ) { diff --git a/templates/web/default/report/new/category_extras.html b/templates/web/default/report/new/category_extras.html index 7be69e30c..928b61041 100644 --- a/templates/web/default/report/new/category_extras.html +++ b/templates/web/default/report/new/category_extras.html @@ -13,8 +13,8 @@ <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> [% IF meta.exists('values') %] <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value.keys %] - <option value="[% meta.values.value.$option.key %]">[% option %]</option> + [% FOR option IN meta.values.value.value %] + <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> [% END %] </select> [% ELSE %] diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html index cb8220eee..ae1214c35 100644 --- a/templates/web/fixmystreet/report/new/category_extras.html +++ b/templates/web/fixmystreet/report/new/category_extras.html @@ -12,11 +12,11 @@ [% IF meta.exists('values') %] <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% FOR option IN meta.values.value %] - <option value="[% option.key.0 %]">[% option.name.0 %]</option> + <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> [% END %] </select> [% ELSE %] - <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] [%- END %] |