fixup! [Northumberland] Being able to filter on only one category in …

…multiple parent categories
mysociety · Jul 30, 2024 · 9aef9f4 · 9aef9f4
1 parent c0d675b
commit 9aef9f4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -171,7 +171,7 @@ sub index : Path : Args(0) {
 
         $c->stash->{category} = \@categories;
         $c->stash->{groups_selected_from} = \@groups_selected_from;
-        $c->stash->{display_categories} = { reverse %display_categories };
+        $c->stash->{display_categories} = \%display_categories;
         $c->stash->{ward} = [ $c->get_param_list('ward') ];
 
         if ($c->user_exists) {

diff --git a/t/app/controller/dashboard.t b/t/app/controller/dashboard.t
@@ -206,8 +206,8 @@ FixMyStreet::override_config {
         $sub_pothole_road->update;
         $mech->get_ok("/dashboard?category=group-Road+%26+more&category=Litter-group-");
         test_table($mech->content, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 2, 0, 4, 6, 1, 0, 0, 1, 4, 1, 4, 9);
-        $sub_pothole_pavement->delete; $sub_pothole_pavement->update;
-        $sub_pothole_road->delete; $sub_pothole_road->update;
+        $sub_pothole_pavement->delete;
+        $sub_pothole_road->delete;
     };
 
     subtest 'test grouping' => sub {

diff --git a/templates/web/base/dashboard/index.html b/templates/web/base/dashboard/index.html
@@ -53,8 +53,8 @@ <h1>[% loc('Summary statistics') %]</h1>
         <label for="category">[% loc('Category:') %]</label>
         <select class="form-control js-multiple" multiple name="category" id="category">
             [% BLOCK category_option %]
-            [% SET category_safe = mark_safe(cat.category) %]
-                <option value='[% cat.category | html %]-[% group.group_id | html %]'[% ' selected' IF display_categories.$category_safe %]>[% cat.category_display | html %]</option>
+            [% SET category_built = mark_safe(cat.category) _ '-' _ mark_safe(group.group_id) %]
+                <option value='[% cat.category | html %]-[% group.group_id | html %]'[% ' selected' IF display_categories.$category_built %]>[% cat.category_display | html %]</option>
             [% END %]
             [%~ INCLUDE 'report/new/_category_select.html' include_group_option=1 ~%]
         </select>