diff --git a/components/member/List.vue b/components/member/List.vue index b6f6b07c268b6285b4086dc37ea6a619de7421bc..30ebeb7e9b85de55cba111f5d06d5d2d7e74f8ec 100644 --- a/components/member/List.vue +++ b/components/member/List.vue @@ -90,8 +90,8 @@ export default { data() { return { - currentSort: "uid", - currentSortDir: "asc", + currentSort: this.defaultSort, + currentSortDir: this.defaultSortDir, pageSize: 5, currentPage: 1 } @@ -117,6 +117,14 @@ export default { adhesion: { type: Boolean, default: false + }, + defaultSortDir: { + type: String, + default: "asc" + }, + defaultSort: { + type: String, + default: "uid" } }, methods: { diff --git a/pages/favoris.vue b/pages/favoris.vue index aa87ca9e471579adf70eeb1ae805b4dd5b37341f..d891a59e37a34cf33b20964e426171eba310640f 100644 --- a/pages/favoris.vue +++ b/pages/favoris.vue @@ -11,8 +11,11 @@ </transition> <transition name="fade"> <MemberList + defaultSort="date_sortie" :members="favoris" - v-if="favoris && favoris.length != 0" /> + v-if=" + !$apollo.queries.favoris.loading && favoris && favoris.length != 0 + " /> </transition> <transition name="fade"> <div diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue index 2062e55da9427efdd2848390df1c967267c1d2ad..48a9d8be3793fce8e0d348c9032ea368d70c45de 100644 --- a/pages/previsions/futures_sorties.vue +++ b/pages/previsions/futures_sorties.vue @@ -37,12 +37,14 @@ {{ $t("statut.bientotmanquecertif") }} </h2> <MemberList + defaultSort="date_sortie" :members="wwResult['outOfCerts']" :displayPubkey="false" /> </div> <div class="col-lg-6"> <h2 class="h4 text-danger text-center">{{ $t("statut.renew") }}</h2> <MemberList + defaultSort="date_sortie" :members="wwResult['membership']" :displayPubkey="false" :adhesion="true" />