diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-11-07 02:30:36 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-11-08 13:28:30 +0300 |
| commit | b4488cee97b8f0b6d4b2849061fde823e988f190 (patch) | |
| tree | 7877b9d8164d8e41bad0c02dc58f1b4e5c9e2805 /app/views/clusters | |
| parent | a551758da2cd625a26397910259a6dbee1e0c713 (diff) | |
Consolidate how we allow user defined namespace
Use model method as single source of truth instead of splitting between
presenter and Kubernetes model
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/gcp/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/clusters/clusters/user/_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/clusters/clusters/user/_show.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/clusters/clusters/gcp/_show.html.haml b/app/views/clusters/clusters/gcp/_show.html.haml index 677e20bfa0a..e9f05eaf453 100644 --- a/app/views/clusters/clusters/gcp/_show.html.haml +++ b/app/views/clusters/clusters/gcp/_show.html.haml @@ -33,7 +33,7 @@ = s_('ClusterIntegration|Show') = clipboard_button(text: @cluster.platform_kubernetes.token, title: s_('ClusterIntegration|Copy Token'), class: 'btn-default') - - if @cluster.allow_project_namespace? + - if @cluster.allow_user_defined_namespace? .form-group = platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)') = platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace') diff --git a/app/views/clusters/clusters/user/_form.html.haml b/app/views/clusters/clusters/user/_form.html.haml index 55ef17cbcf5..9793c77fc2b 100644 --- a/app/views/clusters/clusters/user/_form.html.haml +++ b/app/views/clusters/clusters/user/_form.html.haml @@ -21,7 +21,7 @@ = platform_kubernetes_field.label :token, s_('ClusterIntegration|Token'), class: 'label-bold' = platform_kubernetes_field.text_field :token, class: 'form-control', placeholder: s_('ClusterIntegration|Service token'), autocomplete: 'off' - - if @user_cluster.allow_project_namespace? + - if @user_cluster.allow_user_defined_namespace? .form-group = platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-bold' = platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace') diff --git a/app/views/clusters/clusters/user/_show.html.haml b/app/views/clusters/clusters/user/_show.html.haml index b7a03723324..cac8e72edd3 100644 --- a/app/views/clusters/clusters/user/_show.html.haml +++ b/app/views/clusters/clusters/user/_show.html.haml @@ -22,7 +22,7 @@ %button.js-show-cluster-token.btn-blank{ type: 'button' } = s_('ClusterIntegration|Show') - - if @cluster.allow_project_namespace? + - if @cluster.allow_user_defined_namespace? .form-group = platform_kubernetes_field.label :namespace, s_('ClusterIntegration|Project namespace (optional, unique)'), class: 'label-bold' = platform_kubernetes_field.text_field :namespace, class: 'form-control', placeholder: s_('ClusterIntegration|Project namespace') |