-
-
- {{
- $t("I want to manage the registration with an external provider.")
- }}
-
-
-
-
-
-
-
-
-
@@ -270,21 +246,21 @@
-
+
{{
$t("I want to approve every participation request")
}}
-
+
{{
$t("Limited number of places")
}}
-
+
{
return this.event.title.length > 80
? ["is-info", this.$t("The event title will be ellipsed.") as string]
diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue
old mode 100644
new mode 100755
index e97cb2b6b..ad5cfc7da
--- a/js/src/views/Event/Event.vue
+++ b/js/src/views/Event/Event.vue
@@ -94,13 +94,7 @@
- {{ organizer.domain }}
-
+
Map.get("ical:status", "CONFIRMED") |> String.downcase(),
@@ -130,7 +129,6 @@ defmodule Mobilizon.Federation.ActivityStream.Converter.Event do
"mediaType" => "text/html",
"startTime" => event.begins_on |> shift_tz(event.options.timezone) |> date_to_string(),
"joinMode" => to_string(event.join_options),
- "externalParticipationUrl" => event.external_participation_url,
"endTime" => event.ends_on |> shift_tz(event.options.timezone) |> date_to_string(),
"tag" => event.tags |> build_tags(),
"maximumAttendeeCapacity" => event.options.maximum_attendee_capacity,
diff --git a/lib/graphql/schema/event.ex b/lib/graphql/schema/event.ex
index 2ed720cd7..9a4dd9ea3 100644
--- a/lib/graphql/schema/event.ex
+++ b/lib/graphql/schema/event.ex
@@ -30,7 +30,6 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
field(:status, :event_status, description: "Status of the event")
field(:visibility, :event_visibility, description: "The event's visibility")
field(:join_options, :event_join_options, description: "The event's visibility")
- field(:external_participation_url, :string, description: "External URL for participation")
field(:picture, :media,
description: "The event's picture",
@@ -124,7 +123,6 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
value(:free, description: "Anyone can join and is automatically accepted")
value(:restricted, description: "Manual acceptation")
value(:invite, description: "Participants must be invited")
- value(:external, description: "External registration")
end
@desc "The list of possible options for the event's status"
@@ -381,8 +379,6 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
description: "The event's options to join"
)
- arg(:external_participation_url, :string, description: "External URL for participation")
-
arg(:tags, list_of(:string),
default_value: [],
description: "The list of tags associated to the event"
@@ -443,8 +439,6 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
description: "The event's options to join"
)
- arg(:external_participation_url, :string, description: "External URL for participation")
-
arg(:tags, list_of(:string), description: "The list of tags associated to the event")
arg(:picture, :media_input,
diff --git a/lib/mobilizon/events/event.ex b/lib/mobilizon/events/event.ex
index 4ef3247df..f618e1ab2 100644
--- a/lib/mobilizon/events/event.ex
+++ b/lib/mobilizon/events/event.ex
@@ -47,7 +47,6 @@ defmodule Mobilizon.Events.Event do
draft: boolean,
visibility: atom(),
join_options: atom(),
- external_participation_url: String.t(),
publish_at: DateTime.t() | nil,
uuid: Ecto.UUID.t(),
online_address: String.t() | nil,
@@ -82,7 +81,6 @@ defmodule Mobilizon.Events.Event do
:local,
:visibility,
:join_options,
- :external_participation_url,
:publish_at,
:online_address,
:phone_address,
@@ -107,7 +105,6 @@ defmodule Mobilizon.Events.Event do
field(:draft, :boolean, default: false)
field(:visibility, EventVisibility, default: :public)
field(:join_options, JoinOptions, default: :free)
- field(:external_participation_url, :string)
field(:publish_at, :utc_datetime)
field(:uuid, Ecto.UUID, default: Ecto.UUID.generate())
field(:online_address, :string)
diff --git a/lib/mobilizon/events/events.ex b/lib/mobilizon/events/events.ex
index 264a469f0..8287b4e9d 100644
--- a/lib/mobilizon/events/events.ex
+++ b/lib/mobilizon/events/events.ex
@@ -46,8 +46,7 @@ defmodule Mobilizon.Events do
defenum(JoinOptions, :join_options, [
:free,
:restricted,
- :invite,
- :external
+ :invite
])
defenum(EventStatus, :event_status, [
diff --git a/priv/repo/migrations/20211018230000_add_external_url_for_events.exs b/priv/repo/migrations/20211018230000_add_external_url_for_events.exs
deleted file mode 100644
index 988f79c15..000000000
--- a/priv/repo/migrations/20211018230000_add_external_url_for_events.exs
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Mobilizon.Storage.Repo.Migrations.AddExternalUrlForEvents do
- use Ecto.Migration
- alias Mobilizon.Events.JoinOptions
-
- def change do
- alter table(:events) do
- add(:external_participation_url, :string)
- end
-
- execute("ALTER TABLE events ALTER COLUMN join_options TYPE VARCHAR USING join_options::text")
- execute("ALTER TABLE events ALTER COLUMN join_options DROP DEFAULT")
- JoinOptions.drop_type()
- JoinOptions.create_type()
-
- execute(
- "ALTER TABLE events ALTER COLUMN join_options TYPE join_options USING join_options::join_options"
- )
-
- execute("ALTER TABLE events ALTER COLUMN join_options SET DEFAULT 'free'::join_options")
- end
-end
diff --git a/schema.graphql b/schema.graphql
index 4e920170e..65907e253 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -1551,9 +1551,6 @@ type RootMutationType {
"The event's options to join"
joinOptions: EventJoinOptions
- "External URL for participation"
- externalParticipationUrl: String
-
"The list of tags associated to the event"
tags: [String]
@@ -1623,9 +1620,6 @@ type RootMutationType {
"The event's options to join"
joinOptions: EventJoinOptions
- "External URL for participation"
- externalParticipationUrl: String
-
"The list of tags associated to the event"
tags: [String]
@@ -2968,9 +2962,6 @@ type Event implements ActivityObject & Interactable & ActionLogObject {
"The event's visibility"
joinOptions: EventJoinOptions
- "External URL for participation"
- externalParticipationUrl: String
-
"The event's picture"
picture: Media
@@ -3159,9 +3150,6 @@ enum EventJoinOptions {
"Participants must be invited"
INVITE
-
- "External registration"
- EXTERNAL
}
type InstanceFeeds {