Commit 3995baad authored by Fatih Acet's avatar Fatih Acet

Merge branch 'issue-sidebar-empty-assignee' into 'master'

Resets issue boards assignee dropdown

Closes #26514 and #26814

See merge request !8540
parents 9e90edb3 2c521dd2
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
watch: { watch: {
detail: { detail: {
handler () { handler () {
if (this.issue.id !== this.detail.issue.id) {
$('.js-issue-board-sidebar', this.$el).each((i, el) => {
$(el).data('glDropdown').clearMenu();
});
}
this.issue = this.detail.issue; this.issue = this.detail.issue;
}, },
deep: true deep: true
......
...@@ -512,12 +512,17 @@ ...@@ -512,12 +512,17 @@
// Append the menu into the dropdown // Append the menu into the dropdown
GitLabDropdown.prototype.appendMenu = function(html) { GitLabDropdown.prototype.appendMenu = function(html) {
return this.clearMenu().append(html);
};
GitLabDropdown.prototype.clearMenu = function() {
var selector; var selector;
selector = '.dropdown-content'; selector = '.dropdown-content';
if (this.dropdown.find(".dropdown-toggle-page").length) { if (this.dropdown.find(".dropdown-toggle-page").length) {
selector = ".dropdown-page-one .dropdown-content"; selector = ".dropdown-page-one .dropdown-content";
} }
return $(selector, this.dropdown).empty().append(html);
return $(selector, this.dropdown).empty();
}; };
GitLabDropdown.prototype.renderItem = function(data, group, index) { GitLabDropdown.prototype.renderItem = function(data, group, index) {
......
---
title: Resets assignee dropdown when sidebar is open
merge_request:
author:
...@@ -141,6 +141,36 @@ describe 'Issue Boards', feature: true, js: true do ...@@ -141,6 +141,36 @@ describe 'Issue Boards', feature: true, js: true do
end end
end end
end end
it 'resets assignee dropdown' do
page.within(first('.board')) do
first('.card').click
end
page.within('.assignee') do
click_link 'Edit'
wait_for_ajax
page.within('.dropdown-menu-user') do
click_link user.name
wait_for_vue_resource
end
expect(page).to have_content(user.name)
end
page.within(first('.board')) do
find('.card:nth-child(2)').click
end
page.within('.assignee') do
click_link 'Edit'
expect(page).not_to have_selector('.is-active')
end
end
end end
context 'milestone' do context 'milestone' do
......
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