diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-10 16:11:35 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-10 16:11:35 +0000 |
| commit | c3c04c7dc01ed660c22c4bd43f308a01a47e7bcc (patch) | |
| tree | c698d5d751dfb071b5790d728827f67d8e3ac4ae | |
| parent | f2756c4c825ba73c76fafd84acc3663ea410858a (diff) | |
| parent | 1115f106e0421c10a81c3ce8d187ef6cd3e639fc (diff) | |
Merge branch 'issues/forcouncils/171-filter-dropdown-all'
| -rw-r--r-- | templates/web/base/reports/_list-filters.html | 3 | ||||
| -rw-r--r-- | 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 %] - <select class="form-control js-multiple" name="status" id="statuses" multiple data-all="[% loc('All reports') %]"> + <select class="form-control js-multiple" name="status" id="statuses" multiple + data-all="[% loc('All reports') %]" data-all-options='["open","closed","fixed"]'> [% IF c.user_exists AND c.user.has_body_permission_to('planned_reports') AND !shortlist %] <option value="shortlisted"[% ' selected' IF filter_status.shortlisted %]>[% loc('Shortlisted') %]</option> <option value="unshortlisted"[% ' selected' IF filter_status.unshortlisted %]>[% loc('Unshortlisted') %]</option> diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index df8285942..aa89f8115 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -537,14 +537,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 }] }); } |