summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-27 12:47:11 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-27 12:47:11 +0000
commitb5797168ec529c179342b8c292c2b52f0cbe41ee (patch)
tree2090a879e1e72389d6653d8c3aa8925e358eebb6
parent4d6de50c363bb6316061431d7c9e5c1effd64179 (diff)
parentdaec00a753ff0da2e2d2837a1c77275152d2de39 (diff)
downloadgitlab-ce-b5797168ec529c179342b8c292c2b52f0cbe41ee.tar.gz
Merge branch 'issue-boards-new-list-stop-closing' into 'master'
Create new list dropdown stays open after new list ## What does this MR do? After creating a new list, the dropdown stays open until the user closes the dropdown themselves. ## Screenshots (if relevant) ![keep-open](/uploads/06580dd552647b1a9e5fabc2c978148b/keep-open.gif) ## What are the relevant issue numbers? Closes #22852 See merge request !6742
-rw-r--r--CHANGELOG.md1
-rw-r--r--app/assets/javascripts/boards/components/new_list_dropdown.js.es61
-rw-r--r--spec/features/boards/boards_spec.rb13
3 files changed, 15 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a86512740c4..ff8e03e7d58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Refactor less readable existance checking code from CoffeeScript !6289 (jlogandavison)
- Simpler arguments passed to named_route on toggle_award_url helper method
- Fix typo in framework css class. !7086 (Daniel Voogsgerd)
+ - New issue board list dropdown stays open after adding a new list
- Fix: Backup restore doesn't clear cache
- API: Fix project deploy keys 400 and 500 errors when adding an existing key. !6784 (Joshua Welsh)
- Replace jquery.cookie plugin with js.cookie !7085
diff --git a/app/assets/javascripts/boards/components/new_list_dropdown.js.es6 b/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
index 684f1321a05..fe1a6dc7ea0 100644
--- a/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
+++ b/app/assets/javascripts/boards/components/new_list_dropdown.js.es6
@@ -33,6 +33,7 @@ $(() => {
},
filterable: true,
selectable: true,
+ multiSelect: true,
clicked (label, $el, e) {
e.preventDefault();
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index c533ce1d87f..3234fabe288 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -347,6 +347,19 @@ describe 'Issue Boards', feature: true, js: true do
expect(page).to have_selector('.board', count: 5)
end
+ it 'keeps dropdown open after adding new list' do
+ click_button 'Create new list'
+ wait_for_ajax
+
+ page.within('.dropdown-menu-issues-board-new') do
+ click_link done.title
+ end
+
+ wait_for_vue_resource
+
+ expect(find('.issue-boards-search')).to have_selector('.open')
+ end
+
it 'moves issues from backlog into new list' do
wait_for_board_cards(1, 6)