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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
f849ef79
Commit
f849ef79
authored
Sep 05, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue board label filtering not removing labels
Closes #21417
parent
1e042ac2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
3 deletions
+23
-3
CHANGELOG
CHANGELOG
+1
-0
app/assets/javascripts/labels_select.js
app/assets/javascripts/labels_select.js
+3
-3
spec/features/boards/boards_spec.rb
spec/features/boards/boards_spec.rb
+19
-0
No files found.
CHANGELOG
View file @
f849ef79
...
@@ -37,6 +37,7 @@ v 8.12.0 (unreleased)
...
@@ -37,6 +37,7 @@ v 8.12.0 (unreleased)
- Use 'git update-ref' for safer web commits !6130
- Use 'git update-ref' for safer web commits !6130
- Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling)
- Automatically expand hidden discussions when accessed by a permalink !5585 (Mike Greiling)
- Remove unused mixins (ClemMakesApps)
- Remove unused mixins (ClemMakesApps)
- Fix issue board label filtering appending already filtered labels
- Add search to all issue board lists
- Add search to all issue board lists
- Fix groups sort dropdown alignment (ClemMakesApps)
- Fix groups sort dropdown alignment (ClemMakesApps)
- Add horizontal scrolling to all sub-navs on mobile viewports (ClemMakesApps)
- Add horizontal scrolling to all sub-navs on mobile viewports (ClemMakesApps)
...
...
app/assets/javascripts/labels_select.js
View file @
f849ef79
...
@@ -273,12 +273,12 @@
...
@@ -273,12 +273,12 @@
if
(
page
===
'
projects:boards:show
'
)
{
if
(
page
===
'
projects:boards:show
'
)
{
if
(
label
.
isAny
)
{
if
(
label
.
isAny
)
{
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
]
=
[];
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
]
=
[];
}
else
if
(
label
.
title
)
{
}
else
if
(
$el
.
hasClass
(
'
is-active
'
)
)
{
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
].
push
(
label
.
title
);
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
].
push
(
label
.
title
);
}
else
{
}
else
{
var
filters
=
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
];
var
filters
=
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
];
filters
=
filters
.
filter
(
function
(
l
abel
)
{
filters
=
filters
.
filter
(
function
(
filteredL
abel
)
{
return
label
!==
$el
.
text
().
trim
()
;
return
filteredLabel
!==
label
.
title
;
});
});
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
]
=
filters
;
gl
.
issueBoards
.
BoardsStore
.
state
.
filters
[
'
label_name
'
]
=
filters
;
}
}
...
...
spec/features/boards/boards_spec.rb
View file @
f849ef79
...
@@ -467,6 +467,25 @@ describe 'Issue Boards', feature: true, js: true do
...
@@ -467,6 +467,25 @@ describe 'Issue Boards', feature: true, js: true do
end
end
end
end
it
'removes filtered labels'
do
page
.
within
'.labels-filter'
do
click_button
(
'Label'
)
wait_for_ajax
page
.
within
'.dropdown-menu-labels'
do
click_link
(
testing
.
title
)
end
expect
(
page
).
to
have_css
(
'input[name="label_name[]"]'
,
visible:
false
)
page
.
within
'.dropdown-menu-labels'
do
click_link
(
testing
.
title
)
end
expect
(
page
).
not_to
have_css
(
'input[name="label_name[]"]'
,
visible:
false
)
end
end
it
'infinite scrolls list with label filter'
do
it
'infinite scrolls list with label filter'
do
50
.
times
do
50
.
times
do
create
(
:labeled_issue
,
project:
project
,
labels:
[
testing
])
create
(
:labeled_issue
,
project:
project
,
labels:
[
testing
])
...
...
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