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
b6c1bec5
Commit
b6c1bec5
authored
Mar 14, 2018
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Scoped Boards bug filtering by No Milestone
parent
ae2f45b6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
+4
-2
ee/changelogs/unreleased/psimyn-scoped-milestone-encoding.yml
...hangelogs/unreleased/psimyn-scoped-milestone-encoding.yml
+5
-0
ee/spec/features/boards/scoped_issue_board_spec.rb
ee/spec/features/boards/scoped_issue_board_spec.rb
+8
-1
No files found.
ee/app/assets/javascripts/boards/stores/boards_store_ee.js
View file @
b6c1bec5
...
...
@@ -19,7 +19,7 @@ class BoardsStoreEE {
if
(
this
.
$boardApp
)
{
this
.
store
.
boardConfig
=
{
milestoneId
:
parseInt
(
this
.
$boardApp
.
dataset
.
boardMilestoneId
,
10
),
milestoneTitle
:
this
.
$boardApp
.
dataset
.
boardMilestoneTitle
,
milestoneTitle
:
this
.
$boardApp
.
dataset
.
boardMilestoneTitle
||
''
,
assigneeUsername
:
this
.
$boardApp
.
dataset
.
boardAssigneeUsername
,
labels
:
JSON
.
parse
(
this
.
$boardApp
.
dataset
.
labels
||
[]),
weight
:
parseInt
(
this
.
$boardApp
.
dataset
.
boardWeight
,
10
),
...
...
@@ -42,9 +42,11 @@ class BoardsStoreEE {
let
milestoneTitle
=
this
.
store
.
boardConfig
.
milestoneTitle
;
if
(
this
.
store
.
boardConfig
.
milestoneId
===
0
)
{
milestoneTitle
=
'
No+Milestone
'
;
}
else
{
milestoneTitle
=
encodeURIComponent
(
milestoneTitle
);
}
if
(
milestoneTitle
)
{
updateFilterPath
(
'
milestone_title
'
,
encodeURIComponent
(
milestoneTitle
)
);
updateFilterPath
(
'
milestone_title
'
,
milestoneTitle
);
this
.
store
.
cantEdit
.
push
(
'
milestone
'
);
}
...
...
ee/changelogs/unreleased/psimyn-scoped-milestone-encoding.yml
0 → 100644
View file @
b6c1bec5
---
title
:
Fix Scoped Boards bug filtering by No Milestone
merge_request
:
author
:
type
:
fixed
ee/spec/features/boards/scoped_issue_board_spec.rb
View file @
b6c1bec5
...
...
@@ -46,7 +46,14 @@ describe 'Scoped issue boards', :js do
expect
(
page
).
to
have_selector
(
'.card'
,
count:
1
)
end
it
'creates board to filtering by Any Milestone'
do
it
'creates board filtering by No Milestone'
do
create_board_milestone
(
'No Milestone'
)
expect
(
find
(
'.tokens-container'
)).
to
have_content
(
""
)
expect
(
page
).
to
have_selector
(
'.card'
,
count:
2
)
end
it
'creates board filtering by Any Milestone'
do
create_board_milestone
(
'Any Milestone'
)
expect
(
find
(
'.tokens-container'
)).
to
have_content
(
""
)
...
...
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