From b0a8840369ebe717be26125a59acab02c515cf22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matija=20=C4=8Cupi=C4=87?= Date: Wed, 15 Nov 2017 20:17:42 +0100 Subject: [PATCH] List multiple clusters on ClustersController#index Also: * Stub out index view * Adds the clusters before_action that returns all clusters --- app/controllers/projects/clusters_controller.rb | 10 +++++----- app/views/projects/clusters/index.html.haml | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 app/views/projects/clusters/index.html.haml diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 7808284fb82..6ffe108f7fa 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -1,5 +1,6 @@ class Projects::ClustersController < Projects::ApplicationController before_action :cluster, except: [:login, :index, :new, :new_gcp, :create] + before_action :clusters, only: [:index] before_action :authorize_read_cluster! before_action :authorize_create_cluster!, only: [:new, :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] def index - if project.cluster - redirect_to project_cluster_path(project, project.cluster) - else - redirect_to new_project_cluster_path(project) - end end 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 end + def clusters + @clusters ||= project.clusters.map { |cluster| cluster.present(current_user: current_user) } + end + def create_params params.require(:cluster).permit( :enabled, diff --git a/app/views/projects/clusters/index.html.haml b/app/views/projects/clusters/index.html.haml new file mode 100644 index 00000000000..980a0d5f19a --- /dev/null +++ b/app/views/projects/clusters/index.html.haml @@ -0,0 +1 @@ +Hello World!