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

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

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

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

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