kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Changes after review

This commit is contained in:
Filipa Lacerda 2017-03-29 12:52:17 +01:00
parent 5cad1401b8
commit 5e9f0bead1
3 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/environments/components/environment.js
View File

@ -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(() => {

30
app/assets/javascripts/environments/components/environments_table.js
View File

@ -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>

4
app/assets/javascripts/environments/services/environments_service.js
View File

@ -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}`);
}
}