Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3de1ba6c
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,发现更多精彩内容 >>
未验证
提交
3de1ba6c
编写于
11月 28, 2017
作者:
M
Matija Čupić
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move cluster sourcing from before_action to #index
上级
899a8095
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
2 addition
and
8 deletion
+2
-8
app/controllers/projects/clusters_controller.rb
app/controllers/projects/clusters_controller.rb
+2
-8
未找到文件。
app/controllers/projects/clusters_controller.rb
浏览文件 @
3de1ba6c
class
Projects::ClustersController
<
Projects
::
ApplicationController
class
Projects::ClustersController
<
Projects
::
ApplicationController
before_action
:cluster
,
except:
[
:login
,
:index
,
:new
,
:new_gcp
,
:create
]
before_action
:cluster
,
except:
[
:login
,
:index
,
:new
,
:new_gcp
,
:create
]
before_action
:clusters
,
only:
[
:index
]
before_action
:authorize_read_cluster!
before_action
:authorize_read_cluster!
before_action
:authorize_create_cluster!
,
only:
[
:new
,
:new_gcp
,
:create
]
before_action
:authorize_create_cluster!
,
only:
[
:new
,
:new_gcp
,
:create
]
before_action
:authorize_google_api
,
only:
[
:new_gcp
,
:create
]
before_action
:authorize_google_api
,
only:
[
:new_gcp
,
:create
]
...
@@ -8,8 +7,9 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -8,8 +7,9 @@ class Projects::ClustersController < Projects::ApplicationController
before_action
:authorize_admin_cluster!
,
only:
[
:destroy
]
before_action
:authorize_admin_cluster!
,
only:
[
:destroy
]
def
index
def
index
@clusters
=
Kaminari
.
paginate_array
(
@clusters
).
page
(
params
[
:page
]).
per
(
20
)
@scope
=
params
[
:scope
]
@scope
=
params
[
:scope
]
clusters
=
ClustersFinder
.
new
(
project
,
current_user
,
@scope
).
execute
@clusters
=
clusters
.
page
(
params
[
:page
]).
per
(
20
)
@active_count
=
project
.
clusters
.
enabled
.
count
@active_count
=
project
.
clusters
.
enabled
.
count
@inactive_count
=
project
.
clusters
.
disabled
.
count
@inactive_count
=
project
.
clusters
.
disabled
.
count
@all_count
=
@active_count
+
@inactive_count
@all_count
=
@active_count
+
@inactive_count
...
@@ -102,12 +102,6 @@ class Projects::ClustersController < Projects::ApplicationController
...
@@ -102,12 +102,6 @@ class Projects::ClustersController < Projects::ApplicationController
@cluster
||=
project
.
clusters
.
find_by
(
id:
params
[
:id
])
&
.
present
(
current_user:
current_user
)
||
render_404
@cluster
||=
project
.
clusters
.
find_by
(
id:
params
[
:id
])
&
.
present
(
current_user:
current_user
)
||
render_404
end
end
def
clusters
@scope
=
params
[
:scope
]
||
'all'
scope
=
@scope
&
.
to_sym
@clusters
=
ClustersFinder
.
new
(
project
,
current_user
,
scope
).
execute
end
def
create_params
def
create_params
params
.
require
(
:cluster
).
permit
(
params
.
require
(
:cluster
).
permit
(
:enabled
,
:enabled
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录