BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3995baad
Commit
3995baad
authored
Jan 30, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue-sidebar-empty-assignee' into 'master'
Resets issue boards assignee dropdown Closes #26514 and #26814 See merge request !8540
parents
9e90edb3
2c521dd2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
1 deletion
+46
-1
board_sidebar.js.es6
...assets/javascripts/boards/components/board_sidebar.js.es6
+6
-0
gl_dropdown.js
app/assets/javascripts/gl_dropdown.js
+6
-1
issue-sidebar-empty-assignee.yml
changelogs/unreleased/issue-sidebar-empty-assignee.yml
+4
-0
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 @
3995baad
...
...
@@ -29,6 +29,12 @@
watch: {
detail: {
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;
},
deep: true
...
...
app/assets/javascripts/gl_dropdown.js
View file @
3995baad
...
...
@@ -512,12 +512,17 @@
// Append the menu into the dropdown
GitLabDropdown
.
prototype
.
appendMenu
=
function
(
html
)
{
return
this
.
clearMenu
().
append
(
html
);
};
GitLabDropdown
.
prototype
.
clearMenu
=
function
()
{
var
selector
;
selector
=
'.dropdown-content'
;
if
(
this
.
dropdown
.
find
(
".dropdown-toggle-page"
).
length
)
{
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
)
{
...
...
changelogs/unreleased/issue-sidebar-empty-assignee.yml
0 → 100644
View file @
3995baad
---
title
:
Resets assignee dropdown when sidebar is open
merge_request
:
author
:
spec/features/boards/sidebar_spec.rb
View file @
3995baad
...
...
@@ -141,6 +141,36 @@ describe 'Issue Boards', feature: true, js: true do
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
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