diff options
| author | Dennis Tang <dtang@gitlab.com> | 2018-05-06 23:58:40 +0300 |
|---|---|---|
| committer | Dennis Tang <dtang@gitlab.com> | 2018-05-06 23:58:40 +0300 |
| commit | 1a3c976eb98273ba0a376f668e3d516254d776d2 (patch) | |
| tree | f83d6366e4ad66d59f98605c66a5a1647de64d28 /app/assets/javascripts/projects | |
| parent | 6195e0a7917ddefb5642b71fedddc4d38079a201 (diff) | |
improve readability of toggleText chain
Diffstat (limited to 'app/assets/javascripts/projects')
3 files changed, 10 insertions, 10 deletions
diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index b272bac2cd2..65e542025c2 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -63,12 +63,12 @@ export default { } if (!this.hasProject && !this.hasZone) { - return s__('ClusterIntegration|Select project and zone to choose machine type.'); + return s__('ClusterIntegration|Select project.and zone to choose machine type'); } - return this.hasZone - ? s__('ClusterIntegration|Select machine type') - : s__('ClusterIntegration|Select zone to choose machine type'); + return !this.hasZone + ? s__('ClusterIntegration|Select zone to choose machine type') + : s__('ClusterIntegration|Select machine type'); }, searchPlaceholderText() { return s__('ClusterIntegration|Search machine types'); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 62c5dda4e44..36d03a07166 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -66,9 +66,9 @@ export default { return this.selectedProject.name; } - return this.projects.length - ? s__('ClusterIntegration|Select project') - : s__('ClusterIntegration|No projects found'); + return !this.projects.length + ? s__('ClusterIntegration|No projects found') + : s__('ClusterIntegration|Select project'); }, searchPlaceholderText() { return s__('ClusterIntegration|Search projects'); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue index b8fe36f56c4..5520a542f64 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_zone_dropdown.vue @@ -60,9 +60,9 @@ export default { return this.selectedZone; } - return this.$store.state.selectedProject.projectId.length - ? s__('ClusterIntegration|Select zone') - : s__('ClusterIntegration|Select project to choose zone'); + return !this.hasProject + ? s__('ClusterIntegration|Select project to choose zone') + : s__('ClusterIntegration|Select zone'); }, searchPlaceholderText() { return s__('ClusterIntegration|Search zones'); |