From 1115f106e0421c10a81c3ce8d187ef6cd3e639fc Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Thu, 9 Mar 2017 14:23:51 +0000 Subject: Specify options in 'all' status filter. A cobrand may have a blank default that isn't everything, so the "All reports" option must specify all the possible options. --- templates/web/base/reports/_list-filters.html | 3 ++- web/cobrands/fixmystreet/fixmystreet.js | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index 58be5cd50..61a44629d 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -1,5 +1,6 @@ [% select_status = BLOCK %] - [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 8e8941421..6480f47f5 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -722,14 +722,15 @@ $.extend(fixmystreet.set_up, { function make_multi(id) { var $id = $('#' + id), - all = $id.data('all'); + all = $id.data('all'), + allOpts = $id.data('allOptions') || []; $id.multiSelect({ allText: all, noneText: all, positionMenuWithin: $('#side'), presets: [{ name: all, - options: [] + options: allOpts }] }); } -- cgit v1.2.3