Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
6e08d5dc
Commit
6e08d5dc
authored
Jan 12, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resets issue boards assignee dropdown
Closes #26514
parent
5a41d92b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
44 additions
and
1 deletion
+44
-1
app/assets/javascripts/boards/components/board_sidebar.js.es6
...assets/javascripts/boards/components/board_sidebar.js.es6
+4
-0
app/assets/javascripts/gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+6
-1
changelogs/unreleased/issue-sidebar-empty-assignee.yml
changelogs/unreleased/issue-sidebar-empty-assignee.yml
+4
-0
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+30
-0
No files found.
app/assets/javascripts/boards/components/board_sidebar.js.es6
View file @
6e08d5dc
...
@@ -30,6 +30,10 @@
...
@@ -30,6 +30,10 @@
detail: {
detail: {
handler () {
handler () {
this.issue = this.detail.issue;
this.issue = this.detail.issue;
if (this.showSidebar) {
$('.js-user-search', this.$el).data('glDropdown').clearMenu();
}
},
},
deep: true
deep: true
},
},
...
...
app/assets/javascripts/gl_dropdown.js
View file @
6e08d5dc
...
@@ -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
)
{
...
...
changelogs/unreleased/issue-sidebar-empty-assignee.yml
0 → 100644
View file @
6e08d5dc
---
title
:
Resets assignee dropdown when sidebar is open
merge_request
:
author
:
spec/features/boards/sidebar_spec.rb
View file @
6e08d5dc
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment