Revert "Merge branch 'external-events' into 'main'"

This reverts merge request !1223
This commit is contained in:
Thomas Citharel
2022-05-04 07:02:16 +00:00
parent d85f708c37
commit 26cf892758
12 changed files with 6 additions and 135 deletions

View File

@@ -221,33 +221,9 @@
</b-radio>
</div>-->
<div class="field">
<label class="label">{{ $t("External registration") }}</label>
<b-switch v-model="externalParticipation">
{{
$t("I want to manage the registration with an external provider.")
}}
</b-switch>
</div>
<div class="field" v-if="externalParticipation">
<b-field :label="$t('URL')">
<b-input
icon="link"
type="url"
v-model="event.externalParticipationUrl"
placeholder="URL"
/>
</b-field>
</div>
<div
class="field"
v-if="
config &&
config.anonymous.participation.allowed &&
!externalParticipation
"
v-if="config && config.anonymous.participation.allowed"
>
<label class="label">{{ $t("Anonymous participations") }}</label>
<b-switch v-model="eventOptions.anonymousParticipation">
@@ -270,21 +246,21 @@
</b-switch>
</div>
<div class="field" v-if="!externalParticipation">
<div class="field">
<label class="label">{{ $t("Participation approval") }}</label>
<b-switch v-model="needsApproval">{{
$t("I want to approve every participation request")
}}</b-switch>
</div>
<div class="field" v-if="!externalParticipation">
<div class="field">
<label class="label">{{ $t("Number of places") }}</label>
<b-switch v-model="limitedPlaces">{{
$t("Limited number of places")
}}</b-switch>
</div>
<div class="box" v-if="limitedPlaces && !externalParticipation">
<div class="box" v-if="limitedPlaces">
<b-field :label="$t('Number of places')" label-for="number-of-places">
<b-numberinput
controls-position="compact"
@@ -1194,18 +1170,6 @@ export default class EditEvent extends Vue {
}
}
get externalParticipation(): boolean {
return this.event?.joinOptions == EventJoinOptions.EXTERNAL;
}
set externalParticipation(value: boolean) {
if (value === true) {
this.event.joinOptions = EventJoinOptions.EXTERNAL;
} else {
this.event.joinOptions = EventJoinOptions.FREE;
}
}
get checkTitleLength(): Array<string | undefined> {
return this.event.title.length > 80
? ["is-info", this.$t("The event title will be ellipsed.") as string]

10
js/src/views/Event/Event.vue Normal file → Executable file
View File

@@ -94,13 +94,7 @@
</span>
</div>
<div class="column is-3-tablet">
<external-participation-button
v-if="event.joinOptions === EventJoinOptions.EXTERNAL"
:event="event"
:current-actor="currentActor"
/>
<participation-section
v-else
:participation="participations[0]"
:event="event"
:anonymousParticipation="anonymousParticipation"
@@ -126,7 +120,7 @@
<tag>{{ organizer.domain }}</tag>
</a>
</template>
<p v-if="event.joinOptions !== EventJoinOptions.EXTERNAL">
<p>
<router-link
class="participations-link"
v-if="canManageEvent && event.draft === false"
@@ -514,7 +508,6 @@ import { CREATE_REPORT } from "../../graphql/report";
import EventMixin from "../../mixins/event";
import IdentityPicker from "../Account/IdentityPicker.vue";
import ParticipationSection from "../../components/Participation/ParticipationSection.vue";
import ExternalParticipationButton from "../../components/Event/ExternalParticipationButton.vue";
import RouteName from "../../router/name";
import CommentTree from "../../components/Comment/CommentTree.vue";
import "intersection-observer";
@@ -549,7 +542,6 @@ import { IUser } from "@/types/current-user.model";
ReportModal,
IdentityPicker,
ParticipationSection,
ExternalParticipationButton,
CommentTree,
Tag,
PopoverActorCard,