diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-10 18:04:04 +0000 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2017-03-10 18:05:22 +0000 |
| commit | 8b19bd2c900e94b1dff643211a4b3a93c8718c27 (patch) | |
| tree | 665fc3b7d751d3f3618953688f22a574d8b1c651 | |
| parent | 57e5cd72ed7fe2f8b9c72a1390a7ad37fd5cfcc2 (diff) | |
Be clearer if no states selected is not all states
As with 1115f106, a default might not be everything.
| -rw-r--r-- | templates/web/base/reports/_list-filters.html | 6 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/templates/web/base/reports/_list-filters.html b/templates/web/base/reports/_list-filters.html index 61a44629d..ce4666156 100644 --- a/templates/web/base/reports/_list-filters.html +++ b/templates/web/base/reports/_list-filters.html @@ -1,6 +1,10 @@ [% select_status = BLOCK %] <select class="form-control js-multiple" name="status" id="statuses" multiple - data-all="[% loc('All reports') %]" data-all-options='["open","closed","fixed"]'> + data-all="[% loc('All reports') %]" data-all-options='["open","closed","fixed"]' + [%~ IF c.cobrand.on_map_default_status == 'open' %] + data-none="[% loc('Unfixed reports') %]" + [%~ END ~%] + > [% 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 aa89f8115..db61bd008 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -538,10 +538,11 @@ $.extend(fixmystreet.set_up, { function make_multi(id) { var $id = $('#' + id), all = $id.data('all'), + none = $id.data('none') || all, allOpts = $id.data('allOptions') || []; $id.multiSelect({ allText: all, - noneText: all, + noneText: none, positionMenuWithin: $('#side'), presets: [{ name: all, |