diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Around.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/My.pm | 2 | ||||
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Reports.pm | 2 | ||||
| -rw-r--r-- | templates/web/base/report/new/category.html | 4 | ||||
| -rw-r--r-- | templates/web/base/reports/_list-filters.html | 1 |
6 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bfdbe4549..9486b76f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,7 @@ - Upgrade Vagrantfile to use Ubuntu Xenial. #2093 - Add validation to cobrand-specific custom reporting fields. - Drop support for IE7, improve IE8 support. #2114 + - Add ability to have category extra help text. * v2.3.1 (12th February 2018) - Front end improvements: diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 184d61f4f..25f97fd8f 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -233,7 +233,7 @@ sub check_and_stash_category : Private { body_id => [ keys %bodies ], }, { - columns => [ 'category' ], + columns => [ 'category', 'extra' ], order_by => [ 'category' ], distinct => 1 } diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm index f6ba9a6ee..883ccc0ce 100644 --- a/perllib/FixMyStreet/App/Controller/My.pm +++ b/perllib/FixMyStreet/App/Controller/My.pm @@ -159,7 +159,7 @@ sub setup_page_data : Private { my @categories = $c->stash->{problems_rs}->search({ state => [ FixMyStreet::DB::Result::Problem->visible_states() ], }, { - columns => [ 'category' ], + columns => [ 'category', 'extra' ], distinct => 1, order_by => [ 'category' ], } )->all; diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 3b9ceaebc..f4da58d20 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -156,7 +156,7 @@ sub ward : Path : Args(2) { $c->stash->{stats} = $c->cobrand->get_report_stats(); my @categories = $c->stash->{body}->contacts->not_deleted->search( undef, { - columns => [ 'category' ], + columns => [ 'category', 'extra' ], distinct => 1, order_by => [ 'category' ], } )->all; diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index 96b14e75b..83af42c6d 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -2,7 +2,9 @@ [%~ BLOCK category_option ~%] [% cat_op_lc = cat_op.category | lower =%] <option value='[% cat_op.category | html %]'[% ' selected' IF report.category == cat_op.category || category_lc == cat_op_lc || (category_options.size == 2 AND loop.last) ~%] - >[% IF loop.first %][% cat_op.category_display %][% ELSE %][% cat_op.category_display | html %][% END %]</option> + >[% IF loop.first %][% cat_op.category_display %][% ELSE %][% cat_op.category_display | html %][% END %] + [%~ IF cat_op.get_extra_metadata('help_text') %] ([% cat_op.get_extra_metadata('help_text') %])[% END ~%] + </option> [%~ END ~%] [% IF category; diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index ba6becb80..5260aa773 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -40,6 +40,7 @@ [% FOR cat IN filter_categories %] <option value="[% cat.category | html %]"[% ' selected' IF filter_category.${cat.category} %]> [% cat.category_display | html %] + [%~ IF cat.get_extra_metadata('help_text') %] ([% cat.get_extra_metadata('help_text') %])[% END ~%] </option> [% END %] </select> |