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
2c45a73c
Commit
2c45a73c
authored
Jan 16, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed label select toggle not updating correctly
Closes #26119
parent
79373bdc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
1 deletion
+25
-1
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+5
-1
changelogs/unreleased/label-select-toggle.yml
changelogs/unreleased/label-select-toggle.yml
+4
-0
spec/features/issues/form_spec.rb
spec/features/issues/form_spec.rb
+16
-0
No files found.
app/assets/javascripts/labels_select.js
View file @
2c45a73c
...
@@ -336,7 +336,11 @@
...
@@ -336,7 +336,11 @@
.
removeClass
(
'
is-active
'
)
.
removeClass
(
'
is-active
'
)
}
}
if
(
$dropdown
.
hasClass
(
'
js-filter-bulk-update
'
)
||
$dropdown
.
hasClass
(
'
js-issuable-form-dropdown
'
))
{
if
(
$dropdown
.
hasClass
(
'
js-issuable-form-dropdown
'
))
{
return
;
}
if
(
$dropdown
.
hasClass
(
'
js-filter-bulk-update
'
))
{
_this
.
enableBulkLabelDropdown
();
_this
.
enableBulkLabelDropdown
();
_this
.
setDropdownData
(
$dropdown
,
isMarking
,
this
.
id
(
label
));
_this
.
setDropdownData
(
$dropdown
,
isMarking
,
this
.
id
(
label
));
return
;
return
;
...
...
changelogs/unreleased/label-select-toggle.yml
0 → 100644
View file @
2c45a73c
---
title
:
Fixed label dropdown toggle text not correctly updating
merge_request
:
author
:
spec/features/issues/form_spec.rb
View file @
2c45a73c
...
@@ -68,6 +68,22 @@ describe 'New/edit issue', feature: true, js: true do
...
@@ -68,6 +68,22 @@ describe 'New/edit issue', feature: true, js: true do
end
end
end
end
end
end
it
'correctly updates the dropdown toggle when removing a label'
do
click_button
'Labels'
page
.
within
'.dropdown-menu-labels'
do
click_link
label
.
title
end
expect
(
find
(
'.js-label-select'
)).
to
have_content
(
label
.
title
)
page
.
within
'.dropdown-menu-labels'
do
click_link
label
.
title
end
expect
(
find
(
'.js-label-select'
)).
to
have_content
(
'Labels'
)
end
end
end
context
'edit issue'
do
context
'edit issue'
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