diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-20 23:27:13 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-21 17:36:13 +0800 |
| commit | a1a2c9f771a483f58efc46245529f7041ea45968 (patch) | |
| tree | 68716cc1b2489c730312b981d0d6206f7d6a3e23 /app | |
| parent | 44455913ff189423685325f82f2b0e1b8dc67613 (diff) | |
| download | gitlab-ce-a1a2c9f771a483f58efc46245529f7041ea45968.tar.gz | |
Merge branch 'reset-filters-after-click' into 'master'
Reset filters after click
Closes #28463
See merge request !10024
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/filtered_search/filtered_search_dropdown.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js index 134bdc6ad80..e7bf530d343 100644 --- a/app/assets/javascripts/filtered_search/filtered_search_dropdown.js +++ b/app/assets/javascripts/filtered_search/filtered_search_dropdown.js @@ -38,6 +38,7 @@ gl.FilteredSearchDropdownManager.addWordToInput(this.filter, value, true); } + this.resetFilters(); this.dismissDropdown(); this.dispatchInputEvent(); } @@ -107,7 +108,7 @@ const hook = this.getCurrentHook(); if (hook) { - const data = hook.list.data; + const data = hook.list.data || []; const results = data.map((o) => { const updated = o; updated.droplab_hidden = false; |