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
ccce7c79
Commit
ccce7c79
authored
Sep 13, 2018
by
Brett Walker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Filter out archived issues from group issue board
parent
a936a6ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
app/services/boards/issues/list_service.rb
app/services/boards/issues/list_service.rb
+5
-0
spec/services/boards/issues/list_service_spec.rb
spec/services/boards/issues/list_service_spec.rb
+10
-2
No files found.
app/services/boards/issues/list_service.rb
View file @
ccce7c79
...
@@ -56,6 +56,7 @@ module Boards
...
@@ -56,6 +56,7 @@ module Boards
set_parent
set_parent
set_state
set_state
set_scope
set_scope
set_non_archived
params
params
end
end
...
@@ -76,6 +77,10 @@ module Boards
...
@@ -76,6 +77,10 @@ module Boards
params
[
:include_subgroups
]
=
board
.
group_board?
params
[
:include_subgroups
]
=
board
.
group_board?
end
end
def
set_non_archived
params
[
:non_archived
]
=
parent
.
is_a?
(
Group
)
end
# rubocop: disable CodeReuse/ActiveRecord
# rubocop: disable CodeReuse/ActiveRecord
def
board_label_ids
def
board_label_ids
@board_label_ids
||=
board
.
lists
.
movable
.
pluck
(
:label_id
)
@board_label_ids
||=
board
.
lists
.
movable
.
pluck
(
:label_id
)
...
...
spec/services/boards/issues/list_service_spec.rb
View file @
ccce7c79
...
@@ -24,7 +24,7 @@ describe Boards::Issues::ListService do
...
@@ -24,7 +24,7 @@ describe Boards::Issues::ListService do
let!
(
:opened_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
title:
'Issue 1'
,
labels:
[
bug
])
}
let!
(
:opened_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
title:
'Issue 1'
,
labels:
[
bug
])
}
let!
(
:opened_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
title:
'Issue 2'
,
labels:
[
p2
])
}
let!
(
:opened_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
title:
'Issue 2'
,
labels:
[
p2
])
}
let!
(
:reopened_issue1
)
{
create
(
:issue
,
:opened
,
project:
project
,
title:
'
Issue 3
'
)
}
let!
(
:reopened_issue1
)
{
create
(
:issue
,
:opened
,
project:
project
,
title:
'
Reopened Issue 1
'
)
}
let!
(
:list1_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
labels:
[
p2
,
development
])
}
let!
(
:list1_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
labels:
[
p2
,
development
])
}
let!
(
:list1_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
labels:
[
development
])
}
let!
(
:list1_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
labels:
[
development
])
}
...
@@ -44,12 +44,19 @@ describe Boards::Issues::ListService do
...
@@ -44,12 +44,19 @@ describe Boards::Issues::ListService do
end
end
it_behaves_like
'issues list service'
it_behaves_like
'issues list service'
context
'when project is archived'
do
let
(
:project
)
{
create
(
:project
,
:archived
)
}
it_behaves_like
'issues list service'
end
end
end
context
'when parent is a group'
do
context
'when parent is a group'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
:empty_repo
,
namespace:
group
)
}
let
(
:project
)
{
create
(
:project
,
:empty_repo
,
namespace:
group
)
}
let
(
:project1
)
{
create
(
:project
,
:empty_repo
,
namespace:
group
)
}
let
(
:project1
)
{
create
(
:project
,
:empty_repo
,
namespace:
group
)
}
let
(
:project_archived
)
{
create
(
:project
,
:empty_repo
,
:archived
,
namespace:
group
)
}
let
(
:m1
)
{
create
(
:milestone
,
group:
group
)
}
let
(
:m1
)
{
create
(
:milestone
,
group:
group
)
}
let
(
:m2
)
{
create
(
:milestone
,
group:
group
)
}
let
(
:m2
)
{
create
(
:milestone
,
group:
group
)
}
...
@@ -77,7 +84,8 @@ describe Boards::Issues::ListService do
...
@@ -77,7 +84,8 @@ describe Boards::Issues::ListService do
let!
(
:opened_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
title:
'Issue 1'
,
labels:
[
bug
])
}
let!
(
:opened_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
title:
'Issue 1'
,
labels:
[
bug
])
}
let!
(
:opened_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
title:
'Issue 2'
,
labels:
[
p2
,
p2_project
])
}
let!
(
:opened_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
title:
'Issue 2'
,
labels:
[
p2
,
p2_project
])
}
let!
(
:reopened_issue1
)
{
create
(
:issue
,
state:
'opened'
,
project:
project
,
title:
'Issue 3'
,
closed_at:
Time
.
now
)
}
let!
(
:opened_issue3
)
{
create
(
:labeled_issue
,
project:
project_archived
,
milestone:
m1
,
title:
'Issue 3'
,
labels:
[
bug
])
}
let!
(
:reopened_issue1
)
{
create
(
:issue
,
state:
'opened'
,
project:
project
,
title:
'Reopened Issue 1'
,
closed_at:
Time
.
now
)
}
let!
(
:list1_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
labels:
[
p2
,
p2_project
,
development
])
}
let!
(
:list1_issue1
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m1
,
labels:
[
p2
,
p2_project
,
development
])
}
let!
(
:list1_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
labels:
[
development
])
}
let!
(
:list1_issue2
)
{
create
(
:labeled_issue
,
project:
project
,
milestone:
m2
,
labels:
[
development
])
}
...
...
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