Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dd66c6a2
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,发现更多精彩内容 >>
未验证
提交
dd66c6a2
编写于
12月 18, 2017
作者:
M
Matija Čupić
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use helper for feature check in cluster partials
上级
56f719f8
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
15 addition
and
2 deletion
+15
-2
app/helpers/clusters_helper.rb
app/helpers/clusters_helper.rb
+5
-0
app/views/projects/clusters/gcp/_form.html.haml
app/views/projects/clusters/gcp/_form.html.haml
+1
-1
app/views/projects/clusters/gcp/_show.html.haml
app/views/projects/clusters/gcp/_show.html.haml
+4
-0
app/views/projects/clusters/user/_form.html.haml
app/views/projects/clusters/user/_form.html.haml
+1
-1
app/views/projects/clusters/user/_show.html.haml
app/views/projects/clusters/user/_show.html.haml
+4
-0
未找到文件。
app/helpers/clusters_helper.rb
0 → 100644
浏览文件 @
dd66c6a2
module
ClustersHelper
def
has_multiple_clusters?
(
project
)
project
.
feature_available?
(
:multiple_clusters
)
end
end
app/views/projects/clusters/gcp/_form.html.haml
浏览文件 @
dd66c6a2
...
...
@@ -9,7 +9,7 @@
=
field
.
text_field
:name
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Cluster name'
)
.form-group
=
field
.
label
:environment_scope
,
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
text_field
:environment_scope
,
class:
'form-control
js-select-on-focus'
,
disabled:
true
,
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
text_field
:environment_scope
,
class:
'form-control
'
,
readonly:
has_multiple_clusters?
(
@project
)
,
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
fields_for
:provider_gcp
,
@cluster
.
provider_gcp
do
|
provider_gcp_field
|
.form-group
...
...
app/views/projects/clusters/gcp/_show.html.haml
浏览文件 @
dd66c6a2
...
...
@@ -9,6 +9,10 @@
=
form_for
@cluster
,
url:
namespace_project_cluster_path
(
@project
.
namespace
,
@project
,
@cluster
),
as: :cluster
do
|
field
|
=
form_errors
(
@cluster
)
.form-group
=
field
.
label
:environment_scope
,
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
text_field
:environment_scope
,
class:
'form-control js-select-on-focus'
,
readonly:
has_multiple_clusters?
(
@project
),
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
fields_for
:platform_kubernetes
,
@cluster
.
platform_kubernetes
do
|
platform_kubernetes_field
|
.form-group
=
platform_kubernetes_field
.
label
:api_url
,
s_
(
'ClusterIntegration|API URL'
)
...
...
app/views/projects/clusters/user/_form.html.haml
浏览文件 @
dd66c6a2
...
...
@@ -5,7 +5,7 @@
=
field
.
text_field
:name
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Cluster name'
)
.form-group
=
field
.
label
:environment_scope
,
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
text_field
:environment_scope
,
class:
'form-control
js-select-on-focus'
,
disabled:
true
,
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
text_field
:environment_scope
,
class:
'form-control
'
,
readonly:
has_multiple_clusters?
(
@project
)
,
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
fields_for
:platform_kubernetes
,
@cluster
.
platform_kubernetes
do
|
platform_kubernetes_field
|
.form-group
...
...
app/views/projects/clusters/user/_show.html.haml
浏览文件 @
dd66c6a2
...
...
@@ -4,6 +4,10 @@
=
field
.
label
:name
,
s_
(
'ClusterIntegration|Cluster name'
)
=
field
.
text_field
:name
,
class:
'form-control'
,
placeholder:
s_
(
'ClusterIntegration|Cluster name'
)
.form-group
=
field
.
label
:environment_scope
,
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
text_field
:environment_scope
,
class:
'form-control js-select-on-focus'
,
readonly:
has_multiple_clusters?
(
@project
),
placeholder:
s_
(
'ClusterIntegration|Environment scope'
)
=
field
.
fields_for
:platform_kubernetes
,
@cluster
.
platform_kubernetes
do
|
platform_kubernetes_field
|
.form-group
=
platform_kubernetes_field
.
label
:api_url
,
s_
(
'ClusterIntegration|API URL'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录