Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f5ec6b4e
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,发现更多精彩内容 >>
提交
f5ec6b4e
编写于
7月 23, 2019
作者:
H
Heinrich Lee Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove project from show_label_issuables_link?
The project param is unnecessary here
上级
17fe0307
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
26 deletion
+7
-26
app/helpers/labels_helper.rb
app/helpers/labels_helper.rb
+2
-3
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+2
-2
spec/helpers/labels_helper_spec.rb
spec/helpers/labels_helper_spec.rb
+3
-21
未找到文件。
app/helpers/labels_helper.rb
浏览文件 @
f5ec6b4e
...
...
@@ -4,11 +4,10 @@ module LabelsHelper
extend
self
include
ActionView
::
Helpers
::
TagHelper
def
show_label_issuables_link?
(
label
,
issuables_type
,
current_user:
nil
,
project:
nil
)
def
show_label_issuables_link?
(
label
,
issuables_type
,
current_user:
nil
)
return
true
unless
label
.
project_label?
return
true
unless
project
project
.
feature_available?
(
issuables_type
,
current_user
)
label
.
project
.
feature_available?
(
issuables_type
,
current_user
)
end
# Link to a Label
...
...
app/views/shared/_label_row.html.haml
浏览文件 @
f5ec6b4e
-
force_priority
=
local_assigns
.
fetch
(
:force_priority
,
false
)
-
subject_or_group_defined
=
defined?
(
@project
)
||
defined?
(
@group
)
-
show_label_issues_link
=
subject_or_group_defined
&&
show_label_issuables_link?
(
label
,
:issues
,
project:
@project
)
-
show_label_merge_requests_link
=
subject_or_group_defined
&&
show_label_issuables_link?
(
label
,
:merge_requests
,
project:
@project
)
-
show_label_issues_link
=
subject_or_group_defined
&&
show_label_issuables_link?
(
label
,
:issues
)
-
show_label_merge_requests_link
=
subject_or_group_defined
&&
show_label_issuables_link?
(
label
,
:merge_requests
)
.label-name
=
render_label
(
label
,
tooltip:
false
)
...
...
spec/helpers/labels_helper_spec.rb
浏览文件 @
f5ec6b4e
...
...
@@ -3,10 +3,8 @@ require 'spec_helper'
describe
LabelsHelper
do
describe
'#show_label_issuables_link?'
do
shared_examples
'a valid response to show_label_issuables_link?'
do
|
issuables_type
,
when_enabled
=
true
,
when_disabled
=
false
|
let
(
:context_project
)
{
project
}
context
"when asking for a
#{
issuables_type
}
link"
do
subject
{
show_label_issuables_link?
(
label
.
present
(
issuable_subject:
nil
),
issuables_type
,
project:
context_project
)
}
subject
{
show_label_issuables_link?
(
label
.
present
(
issuable_subject:
nil
),
issuables_type
)
}
context
"when
#{
issuables_type
}
are enabled for the project"
do
let
(
:project
)
{
create
(
:project
,
"
#{
issuables_type
}
_access_level"
:
ProjectFeature
::
ENABLED
)
}
...
...
@@ -39,27 +37,11 @@ describe LabelsHelper do
let
(
:label
)
{
create
(
:group_label
,
group:
group
,
title:
'bug'
)
}
context
'when asking for an issue link'
do
context
'in the context of a project'
do
it_behaves_like
'a valid response to show_label_issuables_link?'
,
:issues
,
true
,
true
end
context
'in the context of a group'
do
let
(
:context_project
)
{
nil
}
it_behaves_like
'a valid response to show_label_issuables_link?'
,
:issues
,
true
,
true
end
it_behaves_like
'a valid response to show_label_issuables_link?'
,
:issues
,
true
,
true
end
context
'when asking for a merge requests link'
do
context
'in the context of a project'
do
it_behaves_like
'a valid response to show_label_issuables_link?'
,
:merge_requests
,
true
,
true
end
context
'in the context of a group'
do
let
(
:context_project
)
{
nil
}
it_behaves_like
'a valid response to show_label_issuables_link?'
,
:merge_requests
,
true
,
true
end
it_behaves_like
'a valid response to show_label_issuables_link?'
,
:merge_requests
,
true
,
true
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录