Skip to content
Snippets Groups Projects
Commit c3323f01 authored by CaTasTrOOf's avatar CaTasTrOOf
Browse files

Fix bug displaying date in future exits

parent c2094578
No related branches found
No related tags found
1 merge request!8Fix bug displaying date in future exits
...@@ -66,11 +66,7 @@ ...@@ -66,11 +66,7 @@
class="d-none d-sm-table-cell" class="d-none d-sm-table-cell"
v-if="displayDate" v-if="displayDate"
@click="redirect(member.hash)"> @click="redirect(member.hash)">
<BadgeDate <BadgeDate :date="date(member)" styleDate="long" />
:date="
Math.min(member.limitDate, member.received_certifications.limit)
"
styleDate="long" />
</td> </td>
<td class="py-1 text-center" :title="$t('favoris.supprimer')"> <td class="py-1 text-center" :title="$t('favoris.supprimer')">
<button <button
...@@ -111,6 +107,10 @@ export default { ...@@ -111,6 +107,10 @@ export default {
displayDate: { displayDate: {
type: Boolean, type: Boolean,
default: true default: true
},
adhesion: {
type: Boolean,
default: false
} }
}, },
methods: { methods: {
...@@ -124,6 +124,10 @@ export default { ...@@ -124,6 +124,10 @@ export default {
this.currentSortDir = this.currentSortDir === "asc" ? "desc" : "asc" this.currentSortDir = this.currentSortDir === "asc" ? "desc" : "asc"
} }
this.currentSort = s this.currentSort = s
},
date(member) {
if (this.adhesion) return member.limitDate
return member.received_certifications.limit
} }
}, },
computed: { computed: {
......
...@@ -44,7 +44,8 @@ ...@@ -44,7 +44,8 @@
<h2 class="h4 text-danger text-center">{{ $t("statut.renew") }}</h2> <h2 class="h4 text-danger text-center">{{ $t("statut.renew") }}</h2>
<MemberList <MemberList
:members="wwResult['membership']" :members="wwResult['membership']"
:displayPubkey="false" /> :displayPubkey="false"
:adhesion="true" />
</div> </div>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment