5 files changed, 23 insertions, 3 deletions
diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html
index 388434e80..cfd85b465 100644
--- a/templates/web/base/admin/user-form.html
+++ b/templates/web/base/admin/user-form.html
@@ -71,6 +71,19 @@
           </li>
         [% END %]
 
+        [% IF contacts AND c.cobrand.moniker != 'zurich'%]
+          <li class="js-user-categories">
+            <div class="admin-hint">
+              <p>
+                [% loc(
+                  "Authorised staff users can be associated with the categories in which they operate.")
+                %]
+              </p>
+            </div>
+            [% INCLUDE 'admin/category-checkboxes.html' %]
+          </li>
+        [% END %]
+
 
       [% IF c.cobrand.moniker != 'zurich' %]
         <li>
@@ -142,6 +155,10 @@
             <li>
               [% group.key %]
               <ul class="no-bullets">
+                <li>
+                  (<a href="#" data-select-all>[% loc('all') %]</a> /
+                  <a href="#" data-select-none>[% loc('none') %]</a>)
+                </li>
                 [% FOREACH permission IN group.value %]
                   <li>
                     <label class="inline">
diff --git a/templates/web/base/around/postcode_form.html b/templates/web/base/around/postcode_form.html
index 9c0bc5942..135a70294 100644
--- a/templates/web/base/around/postcode_form.html
+++ b/templates/web/base/around/postcode_form.html
@@ -17,6 +17,9 @@
                 <input type="hidden" name="partial" value="[% partial_token.token %]">
             [% END %]
 
+            [% IF c.user_exists AND c.user.categories.size %]
+              <input type="hidden" name="filter_category" value="[% c.user.categories.join(",") | html %]">
+            [% END %]
         </form>
     </div>
 </div>
diff --git a/templates/web/base/footer.html b/templates/web/base/footer.html
index 0356840da..5fd74b3a1 100644
--- a/templates/web/base/footer.html
+++ b/templates/web/base/footer.html
@@ -25,7 +25,7 @@
                             %]span[% ELSE %]a href="[% base %]/my"[% END
                             %]>[% c.user_exists ? loc("Your account") : loc("Sign in") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/reports'
-                            %]span[% ELSE %]a href="[% base %]/reports"[% END
+                            %]span[% ELSE %]a href="[% base %]/reports[% IF c.user_exists AND c.user.categories.size %]?filter_category=[% c.user.categories.join(",") | uri | html %][% END %]"[% END
                             %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/alert'
                             %]span[% ELSE %]a href="[% base %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html
index b59ded05d..89a9f89de 100644
--- a/templates/web/oxfordshire/footer.html
+++ b/templates/web/oxfordshire/footer.html
@@ -22,7 +22,7 @@
                         %][% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') %]<li>
                             <[% IF c.req.uri.path == '/my/planned' %]span[% ELSE %]a href="/my/planned"[% END
                              %]>[% loc('Shortlist') %]</[% c.req.uri.path == '/my/planned' ? 'span' : 'a' %]></li>[%
-                        %][% END %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END
+                        %][% END %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports[% IF c.user_exists AND c.user.categories.size %]?filter_category=[% c.user.categories.join(",") | uri | html %][% END %]"[% END
                             %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[%
                         %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END
                             %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[%
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 5b5532b67..042222e1d 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -49,7 +49,7 @@
                         </li>
                         [% END %]
                         <li>
-                            <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END
+                            <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire[% IF c.user_exists AND c.user.categories.size %]?filter_category=[% c.user.categories.join(",") | uri | html %][% END %]"[% END
                                  %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]>
                         </li>
                         <li>