diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-21 12:08:04 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-21 12:08:04 +0300 |
| commit | 7379b60d2c1bdb0368908ecf99e270264d0eecd4 (patch) | |
| tree | 3552171d6de340892e48fb6da96835081bce8bc8 /app/assets/javascripts/issuable_bulk_update_actions.js | |
| parent | 8f306a7dc503ae0fed4acebc528f2bc2030dad83 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issuable_bulk_update_actions.js')
| -rw-r--r-- | app/assets/javascripts/issuable_bulk_update_actions.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/issuable_bulk_update_actions.js b/app/assets/javascripts/issuable_bulk_update_actions.js index 95e10cc75cc..01ea3eee16e 100644 --- a/app/assets/javascripts/issuable_bulk_update_actions.js +++ b/app/assets/javascripts/issuable_bulk_update_actions.js @@ -99,8 +99,11 @@ export default { setOriginalDropdownData() { const $labelSelect = $('.bulk-update .js-label-select'); + const dirtyLabelIds = $labelSelect.data('marked') || []; + const chosenLabelIds = [...this.getOriginalMarkedIds(), ...dirtyLabelIds]; + $labelSelect.data('common', this.getOriginalCommonIds()); - $labelSelect.data('marked', this.getOriginalMarkedIds()); + $labelSelect.data('marked', chosenLabelIds); $labelSelect.data('indeterminate', this.getOriginalIndeterminateIds()); }, |