root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

List multiple clusters on ClustersController#index 

Also:
* Stub out index view
* Adds the clusters before_action that returns all clusters
This commit is contained in:
Matija Čupić 2017-11-15 20:17:42 +01:00
parent 9809e1d404
commit b0a8840369
No known key found for this signature in database
GPG Key ID: 4BAF84FFACD2E5DE
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/projects/clusters_controller.rb
View File

@ -1,5 +1,6 @@
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]
@ -7,11 +8,6 @@ class Projects::ClustersController < Projects::ApplicationController
before_action :authorize_admin_cluster!, only: [:destroy] before_action :authorize_admin_cluster!, only: [:destroy]
def index def index
if project.cluster
redirect_to project_cluster_path(project, project.cluster)
else
redirect_to new_project_cluster_path(project)
end
end end
def login def login
@ -91,6 +87,10 @@ 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
@clusters ||= project.clusters.map { |cluster| cluster.present(current_user: current_user) }
end
def create_params def create_params
params.require(:cluster).permit( params.require(:cluster).permit(
:enabled, :enabled,

1
app/views/projects/clusters/index.html.haml Normal file
View File

@ -0,0 +1 @@
Hello World!