diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-29 10:27:47 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-29 10:27:47 +0000 |
| commit | e69a4b0809256b1d8930789e3eafef4b6b483971 (patch) | |
| tree | 60c331422c288e1622862a925a887165120b95ce /app | |
| parent | 8ba44e467cbd907218a6696e17d45e5e93c24b61 (diff) | |
| parent | ea05f66575f3717a2285e59638d142ccc8ed1887 (diff) | |
| download | gitlab-ce-e69a4b0809256b1d8930789e3eafef4b6b483971.tar.gz | |
Merge branch '52383-ui-filter-assignee-none-any' into 'master'
Add None/Any options for assignee in search bar
Closes #52383
See merge request gitlab-org/gitlab-ce!22599
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js | 7 | ||||
| -rw-r--r-- | app/views/shared/issuable/_search_bar.html.haml | 7 |
2 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js index b70125c80ca..e22f542b7bf 100644 --- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js +++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js @@ -58,11 +58,16 @@ export const alternativeTokenKeys = [ export const conditions = [ { - url: 'assignee_id=0', + url: 'assignee_id=None', tokenKey: 'assignee', value: 'none', }, { + url: 'assignee_id=Any', + tokenKey: 'assignee', + value: 'any', + }, + { url: 'milestone_title=No+Milestone', tokenKey: 'milestone', value: 'none', diff --git a/app/views/shared/issuable/_search_bar.html.haml b/app/views/shared/issuable/_search_bar.html.haml index cb45928d9a5..1d876cc4a5d 100644 --- a/app/views/shared/issuable/_search_bar.html.haml +++ b/app/views/shared/issuable/_search_bar.html.haml @@ -61,7 +61,10 @@ %ul{ data: { dropdown: true } } %li.filter-dropdown-item{ data: { value: 'none' } } %button.btn.btn-link{ type: 'button' } - = _('No Assignee') + = _('None') + %li.filter-dropdown-item{ data: { value: 'any' } } + %button.btn.btn-link{ type: 'button' } + = _('Any') %li.divider.droplab-item-ignore - if current_user = render 'shared/issuable/user_dropdown_item', @@ -81,7 +84,7 @@ %li.filter-dropdown-item{ data: { value: 'upcoming' } } %button.btn.btn-link{ type: 'button' } = _('Upcoming') - %li.filter-dropdown-item{ 'data-value' => 'started' } + %li.filter-dropdown-item{ data: { value: 'started' } } %button.btn.btn-link{ type: 'button' } = _('Started') %li.divider.droplab-item-ignore |