Chapril/mobilizon.chapril.org-mobilizon
Chapril
/
mobilizon.chapril.org-mobilizon
24
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix showing past events on group page 

Closes #1172

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2022-10-25 10:48:09 +02:00
parent 5225431d60
commit e32611c968
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/views/Event/GroupEvents.vue
View File

@ -123,7 +123,7 @@ const { result: membershipsResult } = useQuery<{
() => ({ enabled: currentActor.value?.id !== undefined }) () => ({ enabled: currentActor.value?.id !== undefined })
); );
const memberships = computed( const memberships = computed(
() => membershipsResult.value?.person.memberships.elements () => membershipsResult.value?.person.memberships?.elements
); );
const route = useRoute(); const route = useRoute();

8
js/src/views/Group/GroupView.vue
View File

@ -543,7 +543,7 @@
:to="{ :to="{
name: RouteName.GROUP_EVENTS, name: RouteName.GROUP_EVENTS,
params: { preferredUsername: usernameWithDomain(group) }, params: { preferredUsername: usernameWithDomain(group) },
query: { future: false }, query: { showPassedEvents: true },
}" }"
>{{ t("View past events") }}</o-button >{{ t("View past events") }}</o-button
> >
@ -559,7 +559,9 @@
:to="{ :to="{
name: RouteName.GROUP_EVENTS, name: RouteName.GROUP_EVENTS,
params: { preferredUsername: usernameWithDomain(group) }, params: { preferredUsername: usernameWithDomain(group) },
query: { future: organizedEvents.elements.length > 0 }, query: {
showPassedEvents: organizedEvents.elements.length === 0,
},
}" }"
>{{ t("View all events") }}</o-button >{{ t("View all events") }}</o-button
> >
@ -696,7 +698,7 @@ const {
group, group,
loading: groupLoading, loading: groupLoading,
refetch: refetchGroup, refetch: refetchGroup,
} = useGroup(props.preferredUsername); } = useGroup(props.preferredUsername, { afterDateTime: new Date() });
const router = useRouter(); const router = useRouter();
const { t } = useI18n({ useScope: "global" }); const { t } = useI18n({ useScope: "global" });