potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
Conversation 0 Commits 80 Files changed 68 +76 -84
2 changed files with 76 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit e7a42f08a0 - Show all commits

73
src/components/Event/EventActionSection.vue
View file

@ -110,67 +110,66 @@
{{ t("Actions") }} {{ t("Actions") }}
</o-button> </o-button>
</template> </template>
<o-dropdown-item aria-role="listitem" has-link v-if="canManageEvent"> <o-dropdown-item
<router-link aria-role="listitem"
class="flex gap-1" has-link
:to="{ v-if="canManageEvent"
@click="
router.push({
name: RouteName.PARTICIPATIONS, name: RouteName.PARTICIPATIONS,
params: { eventId: event?.uuid }, params: { eventId: event?.uuid },
}" })
> "
<AccountMultiple /> >
{{ t("Participations") }} <AccountMultiple />
</router-link> {{ t("Participations") }}
</o-dropdown-item> </o-dropdown-item>
<o-dropdown-item aria-role="listitem" has-link v-if="canManageEvent"> <o-dropdown-item
<router-link aria-role="listitem"
class="flex gap-1" has-link
:to="{ v-if="canManageEvent"
@click="
router.push({
name: RouteName.ANNOUNCEMENTS, name: RouteName.ANNOUNCEMENTS,
params: { eventId: event?.uuid }, params: { eventId: event?.uuid },
}" })
> "
<Bullhorn /> >
{{ t("Announcements") }} <Bullhorn />
</router-link> {{ t("Announcements") }}
</o-dropdown-item> </o-dropdown-item>
<o-dropdown-item <o-dropdown-item
aria-role="listitem" aria-role="listitem"
has-link has-link
v-if="canManageEvent || event?.draft" v-if="canManageEvent || event?.draft"
> @click="
<router-link router.push({
class="flex gap-1"
:to="{
name: RouteName.EDIT_EVENT, name: RouteName.EDIT_EVENT,
params: { eventId: event?.uuid }, params: { eventId: event?.uuid },
}" })
> "
<Pencil /> >
{{ t("Edit") }} <Pencil />
</router-link> {{ t("Edit") }}
</o-dropdown-item> </o-dropdown-item>
<o-dropdown-item <o-dropdown-item
aria-role="listitem" aria-role="listitem"
has-link has-link
v-if="canManageEvent || event?.draft" v-if="canManageEvent || event?.draft"
> @click="
<router-link router.push({
class="flex gap-1"
:to="{
name: RouteName.DUPLICATE_EVENT, name: RouteName.DUPLICATE_EVENT,
params: { eventId: event?.uuid }, params: { eventId: event?.uuid },
}" })
> "
<ContentDuplicate /> >
{{ t("Duplicate") }} <ContentDuplicate />
</router-link> {{ t("Duplicate") }}
</o-dropdown-item> </o-dropdown-item>
<o-dropdown-item <o-dropdown-item
aria-role="listitem" aria-role="listitem"
v-if="canManageEvent || event?.draft" v-if="canManageEvent || event?.draft"
@click="openDeleteEventModal" @click="openDeleteEventModal"
@keyup.enter="openDeleteEventModal"
><span class="flex gap-1"> ><span class="flex gap-1">
<Delete /> <Delete />
{{ t("Delete") }} {{ t("Delete") }}

87
src/components/Event/EventParticipationCard.vue
View file

@ -206,16 +206,14 @@
ParticipantRole.NOT_APPROVED, ParticipantRole.NOT_APPROVED,
].includes(participation.role) ].includes(participation.role)
" "
@click="
gotToWithCheck(participation, {
name: RouteName.EDIT_EVENT,
params: { eventId: participation.event.uuid },
})
"
> >
<div <div class="flex gap-1">
class="flex gap-1"
@click="
gotToWithCheck(participation, {
name: RouteName.EDIT_EVENT,
params: { eventId: participation.event.uuid },
})
"
>
<Pencil /> <Pencil />
{{ t("Edit") }} {{ t("Edit") }}
</div> </div>
@ -224,16 +222,14 @@
<o-dropdown-item <o-dropdown-item
aria-role="listitem" aria-role="listitem"
v-if="participation.role === ParticipantRole.CREATOR" v-if="participation.role === ParticipantRole.CREATOR"
@click="
gotToWithCheck(participation, {
name: RouteName.DUPLICATE_EVENT,
params: { eventId: participation.event.uuid },
})
"
> >
<div <div class="flex gap-1">
class="flex gap-1"
@click="
gotToWithCheck(participation, {
name: RouteName.DUPLICATE_EVENT,
params: { eventId: participation.event.uuid },
})
"
>
<ContentDuplicate /> <ContentDuplicate />
{{ t("Duplicate") }} {{ t("Duplicate") }}
</div> </div>
@ -247,8 +243,9 @@
ParticipantRole.NOT_APPROVED, ParticipantRole.NOT_APPROVED,
].includes(participation.role) ].includes(participation.role)
" "
@click="openDeleteEventModalWrapper"
> >
<div @click="openDeleteEventModalWrapper" class="flex gap-1"> <div class="flex gap-1">
<Delete /> <Delete />
{{ t("Delete") }} {{ t("Delete") }}
</div> </div>
@ -262,16 +259,14 @@
ParticipantRole.NOT_APPROVED, ParticipantRole.NOT_APPROVED,
].includes(participation.role) ].includes(participation.role)
" "
@click="
gotToWithCheck(participation, {
name: RouteName.PARTICIPATIONS,
params: { eventId: participation.event.uuid },
})
"
> >
<div <div class="flex gap-1">
class="flex gap-1"
@click="
gotToWithCheck(participation, {
name: RouteName.PARTICIPATIONS,
params: { eventId: participation.event.uuid },
})
"
>
<AccountMultiplePlus /> <AccountMultiplePlus />
{{ t("Manage participations") }} {{ t("Manage participations") }}
</div> </div>
@ -286,30 +281,28 @@
ParticipantRole.NOT_APPROVED, ParticipantRole.NOT_APPROVED,
].includes(participation.role) ].includes(participation.role)
" "
> @click="
<router-link router.push({
class="flex gap-1"
:to="{
name: RouteName.ANNOUNCEMENTS, name: RouteName.ANNOUNCEMENTS,
params: { eventId: participation.event?.uuid }, params: { eventId: participation.event?.uuid },
}" })
> "
<Bullhorn /> >
{{ t("Announcements") }} <Bullhorn />
</router-link> {{ t("Announcements") }}
</o-dropdown-item> </o-dropdown-item>
<o-dropdown-item aria-role="listitem"> <o-dropdown-item
<router-link aria-role="listitem"
class="flex gap-1" @click="
:to="{ router.push({
name: RouteName.EVENT, name: RouteName.EVENT,
params: { uuid: participation.event.uuid }, params: { eventId: participation.event.uuid },
}" })
> "
<ViewCompact /> >
{{ t("View event page") }} <ViewCompact />
</router-link> {{ t("View event page") }}
</o-dropdown-item> </o-dropdown-item>
</o-dropdown> </o-dropdown>
</div> </div>