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
2be89e25
Commit
2be89e25
authored
Jan 13, 2021
by
Florie Guibert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename Backlog list to Open for Swimlanes
parent
da3ab886
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
4 deletions
+24
-4
app/assets/javascripts/boards/boards_util.js
app/assets/javascripts/boards/boards_util.js
+4
-2
app/assets/javascripts/boards/stores/actions.js
app/assets/javascripts/boards/stores/actions.js
+2
-1
ee/changelogs/unreleased/296976-the-open-list-in-boards-with-swimlanes-applied-is-mislabeled-as.yml
...ist-in-boards-with-swimlanes-applied-is-mislabeled-as.yml
+5
-0
ee/spec/features/boards/swimlanes/epics_swimlanes_spec.rb
ee/spec/features/boards/swimlanes/epics_swimlanes_spec.rb
+13
-1
No files found.
app/assets/javascripts/boards/boards_util.js
View file @
2be89e25
import
{
sortBy
}
from
'
lodash
'
;
import
{
__
}
from
'
~/locale
'
;
import
{
ListType
}
from
'
./constants
'
;
import
{
getIdFromGraphQLId
}
from
'
~/graphql_shared/utils
'
;
...
...
@@ -8,14 +9,15 @@ export function getMilestone() {
export
function
updateListPosition
(
listObj
)
{
const
{
listType
}
=
listObj
;
let
{
position
}
=
listObj
;
let
{
position
,
title
}
=
listObj
;
if
(
listType
===
ListType
.
closed
)
{
position
=
Infinity
;
}
else
if
(
listType
===
ListType
.
backlog
)
{
position
=
-
Infinity
;
title
=
__
(
'
Open
'
);
}
return
{
...
listObj
,
position
};
return
{
...
listObj
,
title
,
position
};
}
export
function
formatBoardLists
(
lists
)
{
...
...
app/assets/javascripts/boards/stores/actions.js
View file @
2be89e25
...
...
@@ -12,6 +12,7 @@ import {
fullBoardId
,
formatListsPageInfo
,
formatIssue
,
updateListPosition
,
}
from
'
../boards_util
'
;
import
createFlash
from
'
~/flash
'
;
import
{
__
}
from
'
~/locale
'
;
...
...
@@ -131,7 +132,7 @@ export default {
},
addList
:
({
commit
},
list
)
=>
{
commit
(
types
.
RECEIVE_ADD_LIST_SUCCESS
,
list
);
commit
(
types
.
RECEIVE_ADD_LIST_SUCCESS
,
updateListPosition
(
list
)
);
},
fetchLabels
:
({
state
,
commit
},
searchTerm
)
=>
{
...
...
ee/changelogs/unreleased/296976-the-open-list-in-boards-with-swimlanes-applied-is-mislabeled-as.yml
0 → 100644
View file @
2be89e25
---
title
:
Rename Backlog list to Open for Swimlanes
merge_request
:
51539
author
:
type
:
fixed
ee/spec/features/boards/swimlanes/epics_swimlanes_spec.rb
View file @
2be89e25
...
...
@@ -8,7 +8,7 @@ RSpec.describe 'epics swimlanes', :js do
let_it_be
(
:project
)
{
create
(
:project
,
:public
,
group:
group
)
}
let_it_be
(
:board
)
{
create
(
:board
,
project:
project
)
}
let_it_be
(
:label
)
{
create
(
:label
,
project:
project
,
name:
'Label
1'
)
}
let_it_be
(
:label
)
{
create
(
:label
,
project:
project
,
name:
'Label1'
)
}
let_it_be
(
:list
)
{
create
(
:list
,
board:
board
,
label:
label
,
position:
0
)
}
let_it_be
(
:issue1
)
{
create
(
:issue
,
project:
project
,
labels:
[
label
])
}
...
...
@@ -40,6 +40,18 @@ RSpec.describe 'epics swimlanes', :js do
expect
(
page
.
find
(
'span[data-testid="issues-lane-issue-count"]'
)).
to
have_content
(
'1'
)
end
end
it
'displays default lists and a label list'
do
lists
=
%w[Open Label1 Closed]
wait_for_requests
expect
(
page
).
to
have_selector
(
'.board-header'
,
count:
3
)
page
.
all
(
'.board-header'
).
each_with_index
do
|
list
,
i
|
expect
(
list
.
find
(
'.board-title'
)).
to
have_content
(
lists
[
i
])
end
end
end
before
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