diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-07 12:39:27 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2018-12-07 12:39:27 +0000 |
| commit | 4d645c20f450d5ebe88e98f1fea677de008fe867 (patch) | |
| tree | 25e7b172e03922c59e4e7177fcd2289ffca501c7 | |
| parent | f4421a0b93793708a3746cecdc82b84bbfdc910e (diff) | |
| parent | 62e82ba95f5ff7cb7f68c90921957417e286a334 (diff) | |
| download | gitlab-ce-4d645c20f450d5ebe88e98f1fea677de008fe867.tar.gz | |
Merge branch 'winh-milestone-select' into 'master'
Fix duplicate boardsStore variable in milestone select
Closes #54139
See merge request gitlab-org/gitlab-ce!23625
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 8 | ||||
| -rw-r--r-- | changelogs/unreleased/winh-milestone-select.yml | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index d32f39881dd..75c18a9b6a0 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -155,7 +155,7 @@ export default class MilestoneSelect { const { $el, e } = clickEvent; let selected = clickEvent.selectedObj; - let data, boardsStore; + let data, modalStoreFilter; if (!selected) return; if (options.handleClick) { @@ -179,11 +179,11 @@ export default class MilestoneSelect { } if ($dropdown.closest('.add-issues-modal').length) { - boardsStore = ModalStore.store.filter; + modalStoreFilter = ModalStore.store.filter; } - if (boardsStore) { - boardsStore[$dropdown.data('fieldName')] = selected.name; + if (modalStoreFilter) { + modalStoreFilter[$dropdown.data('fieldName')] = selected.name; e.preventDefault(); } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { return Issuable.filterResults($dropdown.closest('form')); diff --git a/changelogs/unreleased/winh-milestone-select.yml b/changelogs/unreleased/winh-milestone-select.yml new file mode 100644 index 00000000000..8464fc6c541 --- /dev/null +++ b/changelogs/unreleased/winh-milestone-select.yml @@ -0,0 +1,5 @@ +--- +title: Fix milestone select in issue sidebar of issue boards +merge_request: 23625 +author: +type: fixed |