diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-16 17:42:59 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-16 18:15:43 +0100 |
| commit | 8a13ef41edce213a7733399bbcfea5bdce77d269 (patch) | |
| tree | a9b6a3261e4b96c97dcdce33a280cb7e6ae18850 | |
| parent | 9616e70a08b3900ae3a605ffbbe7ef5ebc763068 (diff) | |
| download | gitlab-ce-8a13ef41edce213a7733399bbcfea5bdce77d269.tar.gz | |
Add environment scope field to cluster forms
| -rw-r--r-- | app/views/projects/clusters/_enabled.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/clusters/gcp/_form.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/clusters/gcp/_show.html.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/clusters/user/_form.html.haml | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/app/views/projects/clusters/_enabled.html.haml b/app/views/projects/clusters/_enabled.html.haml index 547b3c8446f..07f07dfbb0c 100644 --- a/app/views/projects/clusters/_enabled.html.haml +++ b/app/views/projects/clusters/_enabled.html.haml @@ -14,4 +14,4 @@ - if can?(current_user, :update_cluster, @cluster) .form-group - = field.submit _('Save'), class: 'btn btn-success' + = field.submit _('Save changes'), class: 'btn btn-success' diff --git a/app/views/projects/clusters/gcp/_form.html.haml b/app/views/projects/clusters/gcp/_form.html.haml index 0f6bae97571..4dcaf568d46 100644 --- a/app/views/projects/clusters/gcp/_form.html.haml +++ b/app/views/projects/clusters/gcp/_form.html.haml @@ -7,6 +7,9 @@ .form-group = 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', disabled: true, placeholder: s_('ClusterIntegration|Environment scope') = field.fields_for :provider_gcp, @cluster.provider_gcp do |provider_gcp_field| .form-group diff --git a/app/views/projects/clusters/gcp/_show.html.haml b/app/views/projects/clusters/gcp/_show.html.haml index 3fa9f69708a..f3122a1bf47 100644 --- a/app/views/projects/clusters/gcp/_show.html.haml +++ b/app/views/projects/clusters/gcp/_show.html.haml @@ -8,6 +8,7 @@ = form_for @cluster, url: namespace_project_cluster_path(@project.namespace, @project, @cluster), as: :cluster do |field| = form_errors(@cluster) + = field.fields_for :platform_kubernetes, @cluster.platform_kubernetes do |platform_kubernetes_field| .form-group = platform_kubernetes_field.label :api_url, s_('ClusterIntegration|API URL') diff --git a/app/views/projects/clusters/user/_form.html.haml b/app/views/projects/clusters/user/_form.html.haml index 4a9bd5186c6..f195b9815bd 100644 --- a/app/views/projects/clusters/user/_form.html.haml +++ b/app/views/projects/clusters/user/_form.html.haml @@ -3,6 +3,9 @@ .form-group = 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', disabled: true, placeholder: s_('ClusterIntegration|Environment scope') = field.fields_for :platform_kubernetes, @cluster.platform_kubernetes do |platform_kubernetes_field| .form-group |