diff options
author | Thong Kuah <tkuah@gitlab.com> | 2018-11-02 10:38:17 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2018-11-02 10:40:56 +1300 |
commit | 2c6a3f6a1a90fb4eb780e081a6673fd2e90c7dc1 (patch) | |
tree | ad043bd526b2ba71bcba7038a91f71763f581dfd | |
parent | 3e7d48317353b8e0ffb066643eb4ced2e9455aec (diff) | |
download | gitlab-ce-2c6a3f6a1a90fb4eb780e081a6673fd2e90c7dc1.tar.gz |
Remove method as using nested resource routes
We introduced hidden_clusterable_fields in this MR but it is no longer
needed as we have gone back to nested resource routes which should
provide the params such as `project_id`.
-rw-r--r-- | app/helpers/clusters_helper.rb | 6 | ||||
-rw-r--r-- | app/views/clusters/clusters/_integration_form.html.haml | 1 | ||||
-rw-r--r-- | app/views/clusters/clusters/gcp/_form.html.haml | 1 | ||||
-rw-r--r-- | app/views/clusters/clusters/gcp/_show.html.haml | 1 | ||||
-rw-r--r-- | app/views/clusters/clusters/user/_form.html.haml | 1 | ||||
-rw-r--r-- | app/views/clusters/clusters/user/_show.html.haml | 1 | ||||
-rw-r--r-- | spec/presenters/project_clusterable_presenter_spec.rb | 6 |
7 files changed, 0 insertions, 17 deletions
diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 94042a2f560..916dcb1a308 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -14,10 +14,4 @@ module ClustersHelper render 'clusters/clusters/gcp_signup_offer_banner' end end - - def hidden_clusterable_fields - clusterable.clusterable_params.map do |key, value| - hidden_field_tag(key, value) - end.reduce(&:safe_concat) - end end diff --git a/app/views/clusters/clusters/_integration_form.html.haml b/app/views/clusters/clusters/_integration_form.html.haml index 0792ad0085c..5e451f60c9d 100644 --- a/app/views/clusters/clusters/_integration_form.html.haml +++ b/app/views/clusters/clusters/_integration_form.html.haml @@ -1,6 +1,5 @@ = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field| = form_errors(@cluster) - = hidden_clusterable_fields .form-group %h5= s_('ClusterIntegration|Integration status') %label.append-bottom-0.js-cluster-enable-toggle-area diff --git a/app/views/clusters/clusters/gcp/_form.html.haml b/app/views/clusters/clusters/gcp/_form.html.haml index cff5cf335dc..ad842036a62 100644 --- a/app/views/clusters/clusters/gcp/_form.html.haml +++ b/app/views/clusters/clusters/gcp/_form.html.haml @@ -14,7 +14,6 @@ = form_for @gcp_cluster, html: { class: 'js-gke-cluster-creation prepend-top-20', data: { token: token_in_session } }, url: clusterable.create_gcp_clusters_path, as: :cluster do |field| = form_errors(@gcp_cluster) - = hidden_clusterable_fields .form-group = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold' = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') diff --git a/app/views/clusters/clusters/gcp/_show.html.haml b/app/views/clusters/clusters/gcp/_show.html.haml index e0159cee4a3..6021b220285 100644 --- a/app/views/clusters/clusters/gcp/_show.html.haml +++ b/app/views/clusters/clusters/gcp/_show.html.haml @@ -8,7 +8,6 @@ = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field| = form_errors(@cluster) - = hidden_clusterable_fields = field.fields_for :platform_kubernetes, @cluster.platform_kubernetes do |platform_kubernetes_field| .form-group diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index 43c15274180..4e6232b69de 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -1,6 +1,5 @@ = form_for @user_cluster, url: clusterable.create_user_clusters_path, as: :cluster do |field| = form_errors(@user_cluster) - = hidden_clusterable_fields .form-group = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold' = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') diff --git a/app/views/clusters/clusters/user/_show.html.haml b/app/views/clusters/clusters/user/_show.html.haml index 4eae08d1250..a871fef0240 100644 --- a/app/views/clusters/clusters/user/_show.html.haml +++ b/app/views/clusters/clusters/user/_show.html.haml @@ -1,6 +1,5 @@ = form_for @cluster, url: clusterable.cluster_path(@cluster), as: :cluster do |field| = form_errors(@cluster) - = hidden_clusterable_fields .form-group = field.label :name, s_('ClusterIntegration|Kubernetes cluster name'), class: 'label-bold' = field.text_field :name, class: 'form-control', placeholder: s_('ClusterIntegration|Kubernetes cluster name') diff --git a/spec/presenters/project_clusterable_presenter_spec.rb b/spec/presenters/project_clusterable_presenter_spec.rb index b12143146f9..c50d90ae1e8 100644 --- a/spec/presenters/project_clusterable_presenter_spec.rb +++ b/spec/presenters/project_clusterable_presenter_spec.rb @@ -74,10 +74,4 @@ describe ProjectClusterablePresenter do it { is_expected.to eq(project_cluster_path(project, cluster)) } end - - describe '#clusterable_params' do - subject { presenter.clusterable_params } - - it { is_expected.to eq({ project_id: project.to_param, namespace_id: project.namespace.to_param }) } - end end |