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

Merge branch 'fixes' into 'main' 

Two fixes

Closes #1239 et #1216

See merge request framasoft/mobilizon!1347
This commit is contained in:
Thomas Citharel 2022-12-21 16:37:45 +00:00
parent 32d3fa4dfc 5929a85ec7
commit 16fa1acf24
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/components/Event/EventFullDate.vue
View File

@ -33,7 +33,7 @@
{{ {{
t("On {date} starting at {startTime}", { t("On {date} starting at {startTime}", {
date: formatDate(beginsOn), date: formatDate(beginsOn),
startTime: formatTime(beginsOn), startTime: formatTime(beginsOn, timezoneToShow),
}) })
}} }}
</p> </p>

10
js/src/components/Event/OrganizerPickerWrapper.vue
View File

@ -76,7 +76,7 @@
v-model:actorFilter="actorFilter" v-model:actorFilter="actorFilter"
/> />
</div> </div>
<div class="max-h-[400px] overflow-y-auto"> <div class="pl-2 max-h-[400px] overflow-y-auto">
<div v-if="isSelectedActorAGroup"> <div v-if="isSelectedActorAGroup">
<p>{{ $t("Add a contact") }}</p> <p>{{ $t("Add a contact") }}</p>
<o-input <o-input
@ -166,6 +166,8 @@ import { useRoute } from "vue-router";
import AccountCircle from "vue-material-design-icons/AccountCircle.vue"; import AccountCircle from "vue-material-design-icons/AccountCircle.vue";
import debounce from "lodash/debounce"; import debounce from "lodash/debounce";
import { IUser } from "@/types/current-user.model"; import { IUser } from "@/types/current-user.model";
import { IMember } from "@/types/actor/member.model";
import { Paginate } from "@/types/paginate";
const MEMBER_ROLES = [ const MEMBER_ROLES = [
MemberRole.CREATOR, MemberRole.CREATOR,
@ -233,7 +235,7 @@ const isComponentModalActive = ref(false);
const contactFilter = ref(""); const contactFilter = ref("");
const membersPage = ref(1); const membersPage = ref(1);
const { result: membersResult } = useQuery( const { result: membersResult } = useQuery<{ group: Pick<IGroup, 'members'> }>(
GROUP_MEMBERS, GROUP_MEMBERS,
() => ({ () => ({
groupName: usernameWithDomain(selectedActor.value), groupName: usernameWithDomain(selectedActor.value),
@ -245,8 +247,8 @@ const { result: membersResult } = useQuery(
() => ({ enabled: selectedActor.value?.type === ActorType.GROUP }) () => ({ enabled: selectedActor.value?.type === ActorType.GROUP })
); );
const members = computed( const members = computed<Paginate<IMember>>(
() => membersResult.value?.members ?? { elements: [], total: 0 } () => selectedActor.value?.type === ActorType.GROUP ? membersResult.value?.group?.members ?? { elements: [], total: 0 } : { elements: [], total: 0 }
); );
const actualContacts = computed({ const actualContacts = computed({