Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
07a227a3
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
07a227a3
编写于
2月 26, 2018
作者:
J
Jan Provaznik
提交者:
Sean McGivern
2月 26, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow to find labels in ancestor groups and better group support in label service
上级
3d493cee
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
116 addition
and
36 deletion
+116
-36
app/finders/labels_finder.rb
app/finders/labels_finder.rb
+11
-4
app/services/issuable_base_service.rb
app/services/issuable_base_service.rb
+11
-3
app/services/labels/find_or_create_service.rb
app/services/labels/find_or_create_service.rb
+16
-6
spec/finders/labels_finder_spec.rb
spec/finders/labels_finder_spec.rb
+23
-0
spec/services/labels/find_or_create_service_spec.rb
spec/services/labels/find_or_create_service_spec.rb
+55
-23
未找到文件。
app/finders/labels_finder.rb
浏览文件 @
07a227a3
...
...
@@ -39,7 +39,7 @@ class LabelsFinder < UnionFinder
end
end
elsif
only_group_labels?
label_ids
<<
Label
.
where
(
group_id:
group
.
id
)
label_ids
<<
Label
.
where
(
group_id:
group
_ids
)
else
label_ids
<<
Label
.
where
(
group_id:
projects
.
group_ids
)
label_ids
<<
Label
.
where
(
project_id:
projects
.
select
(
:id
))
...
...
@@ -59,10 +59,11 @@ class LabelsFinder < UnionFinder
items
.
where
(
title:
title
)
end
def
group
strong_memoize
(
:group
)
do
def
group
_ids
strong_memoize
(
:group
_ids
)
do
group
=
Group
.
find
(
params
[
:group_id
])
authorized_to_read_labels?
(
group
)
&&
group
groups
=
params
[
:include_ancestor_groups
].
present?
?
group
.
self_and_ancestors
:
[
group
]
groups_user_can_read_labels
(
groups
).
map
(
&
:id
)
end
end
...
...
@@ -120,4 +121,10 @@ class LabelsFinder < UnionFinder
Ability
.
allowed?
(
current_user
,
:read_label
,
label_parent
)
end
def
groups_user_can_read_labels
(
groups
)
DeclarativePolicy
.
user_scope
do
groups
.
select
{
|
group
|
authorized_to_read_labels?
(
group
)
}
end
end
end
app/services/issuable_base_service.rb
浏览文件 @
07a227a3
...
...
@@ -77,8 +77,12 @@ class IssuableBaseService < BaseService
return
unless
labels
params
[
:label_ids
]
=
labels
.
split
(
","
).
map
do
|
label_name
|
service
=
Labels
::
FindOrCreateService
.
new
(
current_user
,
project
,
title:
label_name
.
strip
)
label
=
service
.
execute
label
=
Labels
::
FindOrCreateService
.
new
(
current_user
,
parent
,
title:
label_name
.
strip
,
available_labels:
available_labels
).
execute
label
.
try
(
:id
)
end
.
compact
...
...
@@ -102,7 +106,7 @@ class IssuableBaseService < BaseService
end
def
available_labels
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
@available_labels
||=
LabelsFinder
.
new
(
current_user
,
project_id:
@project
.
id
).
execute
end
def
merge_quick_actions_into_params!
(
issuable
)
...
...
@@ -303,4 +307,8 @@ class IssuableBaseService < BaseService
def
update_project_counter_caches?
(
issuable
)
issuable
.
state_changed?
end
def
parent
project
end
end
app/services/labels/find_or_create_service.rb
浏览文件 @
07a227a3
module
Labels
class
FindOrCreateService
def
initialize
(
current_user
,
p
rojec
t
,
params
=
{})
def
initialize
(
current_user
,
p
aren
t
,
params
=
{})
@current_user
=
current_user
@project
=
project
@parent
=
parent
@available_labels
=
params
.
delete
(
:available_labels
)
@params
=
params
.
dup
.
with_indifferent_access
end
...
...
@@ -13,12 +14,13 @@ module Labels
private
attr_reader
:current_user
,
:p
rojec
t
,
:params
,
:skip_authorization
attr_reader
:current_user
,
:p
aren
t
,
:params
,
:skip_authorization
def
available_labels
@available_labels
||=
LabelsFinder
.
new
(
current_user
,
project_id:
project
.
id
"
#{
parent_type
}
_id"
.
to_sym
=>
parent
.
id
,
only_group_labels:
parent_is_group?
).
execute
(
skip_authorization:
skip_authorization
)
end
...
...
@@ -27,8 +29,8 @@ module Labels
def
find_or_create_label
new_label
=
available_labels
.
find_by
(
title:
title
)
if
new_label
.
nil?
&&
(
skip_authorization
||
Ability
.
allowed?
(
current_user
,
:admin_label
,
p
rojec
t
))
new_label
=
Labels
::
CreateService
.
new
(
params
).
execute
(
p
roject:
projec
t
)
if
new_label
.
nil?
&&
(
skip_authorization
||
Ability
.
allowed?
(
current_user
,
:admin_label
,
p
aren
t
))
new_label
=
Labels
::
CreateService
.
new
(
params
).
execute
(
p
arent_type
.
to_sym
=>
paren
t
)
end
new_label
...
...
@@ -37,5 +39,13 @@ module Labels
def
title
params
[
:title
]
||
params
[
:name
]
end
def
parent_type
parent
.
model_name
.
param_key
end
def
parent_is_group?
parent_type
==
"group"
end
end
end
spec/finders/labels_finder_spec.rb
浏览文件 @
07a227a3
...
...
@@ -5,6 +5,8 @@ describe LabelsFinder do
let
(
:group_1
)
{
create
(
:group
)
}
let
(
:group_2
)
{
create
(
:group
)
}
let
(
:group_3
)
{
create
(
:group
)
}
let
(
:private_group_1
)
{
create
(
:group
,
:private
)
}
let
(
:private_subgroup_1
)
{
create
(
:group
,
:private
,
parent:
private_group_1
)
}
let
(
:project_1
)
{
create
(
:project
,
namespace:
group_1
)
}
let
(
:project_2
)
{
create
(
:project
,
namespace:
group_2
)
}
...
...
@@ -20,6 +22,8 @@ describe LabelsFinder do
let!
(
:group_label_1
)
{
create
(
:group_label
,
group:
group_1
,
title:
'Label 1 (group)'
)
}
let!
(
:group_label_2
)
{
create
(
:group_label
,
group:
group_1
,
title:
'Group Label 2'
)
}
let!
(
:group_label_3
)
{
create
(
:group_label
,
group:
group_2
,
title:
'Group Label 3'
)
}
let!
(
:private_group_label_1
)
{
create
(
:group_label
,
group:
private_group_1
,
title:
'Private Group Label 1'
)
}
let!
(
:private_subgroup_label_1
)
{
create
(
:group_label
,
group:
private_subgroup_1
,
title:
'Private Sub Group Label 1'
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -66,6 +70,25 @@ describe LabelsFinder do
expect
(
finder
.
execute
).
to
eq
[
group_label_2
,
group_label_1
]
end
end
context
'when including labels from group ancestors'
,
:nested_groups
do
it
'returns labels from group and its ancestors'
do
private_group_1
.
add_developer
(
user
)
private_subgroup_1
.
add_developer
(
user
)
finder
=
described_class
.
new
(
user
,
group_id:
private_subgroup_1
.
id
,
only_group_labels:
true
,
include_ancestor_groups:
true
)
expect
(
finder
.
execute
).
to
eq
[
private_group_label_1
,
private_subgroup_label_1
]
end
it
'ignores labels from groups which user can not read'
do
private_subgroup_1
.
add_developer
(
user
)
finder
=
described_class
.
new
(
user
,
group_id:
private_subgroup_1
.
id
,
only_group_labels:
true
,
include_ancestor_groups:
true
)
expect
(
finder
.
execute
).
to
eq
[
private_subgroup_label_1
]
end
end
end
context
'filtering by project_id'
do
...
...
spec/services/labels/find_or_create_service_spec.rb
浏览文件 @
07a227a3
...
...
@@ -15,47 +15,79 @@ describe Labels::FindOrCreateService do
context
'when acting on behalf of a specific user'
do
let
(
:user
)
{
create
(
:user
)
}
subject
(
:service
)
{
described_class
.
new
(
user
,
project
,
params
)
}
before
do
project
.
add_developer
(
user
)
end
context
'when label does not exist at group level'
do
it
'creates a new label at project level'
do
expect
{
service
.
execute
}.
to
change
(
project
.
labels
,
:count
).
by
(
1
)
context
'when finding labels on project level'
do
subject
(
:service
)
{
described_class
.
new
(
user
,
project
,
params
)
}
before
do
project
.
add_developer
(
user
)
end
end
context
'when label exists at group level'
do
it
'returns the group label'
do
group_label
=
create
(
:group_label
,
group:
group
,
title:
'Security'
)
context
'when label does not exist at group level'
do
it
'creates a new label at project level'
do
expect
{
service
.
execute
}.
to
change
(
project
.
labels
,
:count
).
by
(
1
)
end
end
expect
(
service
.
execute
).
to
eq
group_label
context
'when label exists at group level'
do
it
'returns the group label'
do
group_label
=
create
(
:group_label
,
group:
group
,
title:
'Security'
)
expect
(
service
.
execute
).
to
eq
group_label
end
end
context
'when label exists at project level'
do
it
'returns the project label'
do
project_label
=
create
(
:label
,
project:
project
,
title:
'Security'
)
expect
(
service
.
execute
).
to
eq
project_label
end
end
end
context
'when label does not exist at group level'
do
it
'creates a new label at project leve'
do
expect
{
service
.
execute
}.
to
change
(
project
.
labels
,
:count
).
by
(
1
)
context
'when finding labels on group level'
do
subject
(
:service
)
{
described_class
.
new
(
user
,
group
,
params
)
}
before
do
group
.
add_developer
(
user
)
end
context
'when label does not exist at group level'
do
it
'creates a new label at group level'
do
expect
{
service
.
execute
}.
to
change
(
group
.
labels
,
:count
).
by
(
1
)
end
end
context
'when label exists at group level'
do
it
'returns the group label'
do
group_label
=
create
(
:group_label
,
group:
group
,
title:
'Security'
)
expect
(
service
.
execute
).
to
eq
group_label
end
end
end
end
context
'when authorization is not required'
do
context
'when finding labels on project level'
do
subject
(
:service
)
{
described_class
.
new
(
nil
,
project
,
params
)
}
context
'when label exists at project level'
do
it
'returns the project label'
do
project_label
=
create
(
:label
,
project:
project
,
title:
'Security'
)
expect
(
service
.
execute
).
to
eq
project_label
expect
(
service
.
execute
(
skip_authorization:
true
)
).
to
eq
project_label
end
end
end
context
'when authorization is not required
'
do
subject
(
:service
)
{
described_class
.
new
(
nil
,
project
,
params
)
}
context
'when finding labels on group level
'
do
subject
(
:service
)
{
described_class
.
new
(
nil
,
group
,
params
)
}
it
'returns the project
label'
do
project_label
=
create
(
:label
,
project:
project
,
title:
'Security'
)
it
'returns the group
label'
do
group_label
=
create
(
:group_label
,
group:
group
,
title:
'Security'
)
expect
(
service
.
execute
(
skip_authorization:
true
)).
to
eq
project_label
expect
(
service
.
execute
(
skip_authorization:
true
)).
to
eq
group_label
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录