Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5cb45b6a
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,发现更多精彩内容 >>
提交
5cb45b6a
编写于
7月 05, 2017
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add CASE When Clause for saving order when using where IN
上级
bd846f7d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
6 deletion
+21
-6
app/models/group.rb
app/models/group.rb
+9
-1
spec/models/group_spec.rb
spec/models/group_spec.rb
+12
-5
未找到文件。
app/models/group.rb
浏览文件 @
5cb45b6a
...
@@ -251,7 +251,15 @@ class Group < Namespace
...
@@ -251,7 +251,15 @@ class Group < Namespace
def
secret_variables_for
(
ref
,
project
)
def
secret_variables_for
(
ref
,
project
)
list_of_ids
=
([
self
]
+
ancestors
).
map
{
|
l
|
l
.
id
}
list_of_ids
=
([
self
]
+
ancestors
).
map
{
|
l
|
l
.
id
}
variables
=
Ci
::
GroupVariable
.
where
(
"group_id IN (
#{
list_of_ids
.
join
(
", "
)
}
)"
)
order
=
list_of_ids
.
map
.
with_index
do
|
id
,
index
|
"WHEN
#{
id
}
THEN
#{
index
}
"
end
.
join
(
"
\n
"
)
variables
=
Ci
::
GroupVariable
.
where
(
"group_id IN (
#{
list_of_ids
.
join
(
", "
)
}
)"
)
.
order
(
"CASE group_id
#{
order
}
END DESC"
)
project
.
protected_for?
(
ref
)
?
variables
:
variables
.
unprotected
project
.
protected_for?
(
ref
)
?
variables
:
variables
.
unprotected
end
end
...
...
spec/models/group_spec.rb
浏览文件 @
5cb45b6a
...
@@ -466,14 +466,21 @@ describe Group, models: true do
...
@@ -466,14 +466,21 @@ describe Group, models: true do
it_behaves_like
'ref is protected'
it_behaves_like
'ref is protected'
end
end
context
'when group has
a child
'
do
context
'when group has
children
'
do
let!
(
:group_child
)
{
create
(
:group
,
:access_requestable
,
parent:
group
)
}
let!
(
:group_child
)
{
create
(
:group
,
parent:
group
)
}
let!
(
:variable_child
)
{
create
(
:ci_group_variable
,
group:
group_child
)
}
let!
(
:variable_child
)
{
create
(
:ci_group_variable
,
group:
group_child
)
}
let!
(
:group_child_3
)
{
create
(
:group
,
parent:
group_child_2
)
}
subject
{
group_child
.
secret_variables_for
(
'ref'
,
project
)
}
let!
(
:variable_child_3
)
{
create
(
:ci_group_variable
,
group:
group_child_3
)
}
let!
(
:group_child_2
)
{
create
(
:group
,
parent:
group_child
)
}
let!
(
:variable_child_2
)
{
create
(
:ci_group_variable
,
group:
group_child_2
)
}
it
'returns all variables belong to the group and parent groups'
do
it
'returns all variables belong to the group and parent groups'
do
is_expected
.
to
contain_exactly
(
secret_variable
,
protected_variable
,
variable_child
)
expected_array1
=
[
protected_variable
,
secret_variable
]
expected_array2
=
[
variable_child
,
variable_child_2
,
variable_child_3
]
got_array
=
group_child_3
.
secret_variables_for
(
'ref'
,
project
).
to_a
expect
(
got_array
.
shift
(
2
)).
to
contain_exactly
(
*
expected_array1
)
expect
(
got_array
).
to
eq
(
expected_array2
)
end
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录