Commit 4d645c20 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'winh-milestone-select' into 'master'

Fix duplicate boardsStore variable in milestone select

Closes #54139

See merge request gitlab-org/gitlab-ce!23625
parents f4421a0b 62e82ba9
...@@ -155,7 +155,7 @@ export default class MilestoneSelect { ...@@ -155,7 +155,7 @@ export default class MilestoneSelect {
const { $el, e } = clickEvent; const { $el, e } = clickEvent;
let selected = clickEvent.selectedObj; let selected = clickEvent.selectedObj;
let data, boardsStore; let data, modalStoreFilter;
if (!selected) return; if (!selected) return;
if (options.handleClick) { if (options.handleClick) {
...@@ -179,11 +179,11 @@ export default class MilestoneSelect { ...@@ -179,11 +179,11 @@ export default class MilestoneSelect {
} }
if ($dropdown.closest('.add-issues-modal').length) { if ($dropdown.closest('.add-issues-modal').length) {
boardsStore = ModalStore.store.filter; modalStoreFilter = ModalStore.store.filter;
} }
if (boardsStore) { if (modalStoreFilter) {
boardsStore[$dropdown.data('fieldName')] = selected.name; modalStoreFilter[$dropdown.data('fieldName')] = selected.name;
e.preventDefault(); e.preventDefault();
} else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) {
return Issuable.filterResults($dropdown.closest('form')); return Issuable.filterResults($dropdown.closest('form'));
......
---
title: Fix milestone select in issue sidebar of issue boards
merge_request: 23625
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment