diff options
Diffstat (limited to 'app/assets/javascripts/environments/components')
-rw-r--r-- | app/assets/javascripts/environments/components/empty_state.vue | 3 | ||||
-rw-r--r-- | app/assets/javascripts/environments/components/environments_table.vue | 22 |
2 files changed, 11 insertions, 14 deletions
diff --git a/app/assets/javascripts/environments/components/empty_state.vue b/app/assets/javascripts/environments/components/empty_state.vue index c7ae1fe8cf0..00e63c3467a 100644 --- a/app/assets/javascripts/environments/components/empty_state.vue +++ b/app/assets/javascripts/environments/components/empty_state.vue @@ -24,7 +24,8 @@ {{ s__("Environments|You don't have any environments right now.") }} </h2> <p class="blank-state-text"> - {{ s__("Environments|Environments are places where code gets deployed, such as staging or production.") }} + {{ s__(`Environments|Environments are places where +code gets deployed, such as staging or production.`) }} <br /> <a :href="helpPath"> {{ s__("Environments|Read more about environments") }} diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue index 4c4ef31b8d1..858acf293a1 100644 --- a/app/assets/javascripts/environments/components/environments_table.vue +++ b/app/assets/javascripts/environments/components/environments_table.vue @@ -30,20 +30,16 @@ export default { default: false, }, }, - - computed: { - shouldRenderFolderContent() { - return this.model.isFolder && - this.model.isOpen && - this.model.children && - this.model.children.length > 0; - }, - }, - methods: { folderUrl(model) { return `${window.location.pathname}/folders/${model.folderName}`; }, + shouldRenderFolderContent(env) { + return env.isFolder && + env.isOpen && + env.children && + env.children.length > 0; + }, }, }; </script> @@ -99,7 +95,7 @@ export default { /> <template - v-if="shouldRenderFolderContent" + v-if="shouldRenderFolderContent(model)" > <div v-if="model.isLoadingFolderContent" @@ -110,11 +106,11 @@ export default { <template v-else> <div is="environment-item" - v-for="children in model.children" + v-for="(children, index) in model.children" :model="children" :can-create-deployment="canCreateDeployment" :can-read-environment="canReadEnvironment" - :key="i" + :key="index" /> <div :key="i"> |