diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-03-29 12:52:17 +0100 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-03-29 12:52:17 +0100 |
commit | 5e9f0bead17d7cb0a336a22a6c8200418ca0fef9 (patch) | |
tree | 3c449e286e7de4ba63f858e37b45a08febf8df8f /app | |
parent | 5cad1401b8a23761b2cc32b079956b5469476a73 (diff) | |
download | gitlab-ce-5e9f0bead17d7cb0a336a22a6c8200418ca0fef9.tar.gz |
Changes after review
Diffstat (limited to 'app')
3 files changed, 17 insertions, 19 deletions
diff --git a/app/assets/javascripts/environments/components/environment.js b/app/assets/javascripts/environments/components/environment.js index 9760b30f30c..0518422e475 100644 --- a/app/assets/javascripts/environments/components/environment.js +++ b/app/assets/javascripts/environments/components/environment.js @@ -132,8 +132,6 @@ export default Vue.component('environment-component', { .then(resp => resp.json()) .then((response) => { this.store.setfolderContent(folder, response.environments); - }) - .then(() => { this.isLoadingFolderContent = false; }) .catch(() => { diff --git a/app/assets/javascripts/environments/components/environments_table.js b/app/assets/javascripts/environments/components/environments_table.js index 0daa942edee..5e6af3a1d45 100644 --- a/app/assets/javascripts/environments/components/environments_table.js +++ b/app/assets/javascripts/environments/components/environments_table.js @@ -73,23 +73,23 @@ export default { </td> </tr> - <tr v-if="!isLoadingFolderContent" - is="environment-item" - v-for="children in model.children" - :model="children" - :can-create-deployment="canCreateDeployment" - :can-read-environment="canReadEnvironment" - :service="service"></tr> + <template v-else> + <tr is="environment-item" + v-for="children in model.children" + :model="children" + :can-create-deployment="canCreateDeployment" + :can-read-environment="canReadEnvironment" + :service="service"></tr> - <tr v-if="!isLoadingFolderContent"> - <td colspan="6" class="text-center"> - <a :href="folderUrl(model)" class="btn btn-default"> - Show all - </a> - </td> - </tr> + <tr> + <td colspan="6" class="text-center"> + <a :href="folderUrl(model)" class="btn btn-default"> + Show all + </a> + </td> + </tr> + </template> </template> - </template> </tbody> </table> diff --git a/app/assets/javascripts/environments/services/environments_service.js b/app/assets/javascripts/environments/services/environments_service.js index ad8d9984561..8adb53ea86d 100644 --- a/app/assets/javascripts/environments/services/environments_service.js +++ b/app/assets/javascripts/environments/services/environments_service.js @@ -7,6 +7,7 @@ Vue.use(VueResource); export default class EnvironmentsService { constructor(endpoint) { this.environments = Vue.resource(endpoint); + this.folderResults = 3; } get(scope, page) { @@ -18,7 +19,6 @@ export default class EnvironmentsService { } getFolderContent(folderUrl) { - const results = 3; - return Vue.http.get(`${folderUrl}.json?per_page=${results}`); + return Vue.http.get(`${folderUrl}.json?per_page=${this.folderResults}`); } } |