Skip to content

Commit a6636c2

Browse files
Chore: remove ticket/video URL fields (#1309)
* talk: remove ticket/video URL fields * talk: normalize ticket base URL * Update app/eventyay/agenda/views/talk.py --------- Co-authored-by: Mario Behling <[email protected]>
1 parent 38f84d7 commit a6636c2

File tree

3 files changed

+7
-25
lines changed

3 files changed

+7
-25
lines changed

app/eventyay/agenda/views/talk.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -360,15 +360,13 @@ def check_user_owning_ticket(user: User, event: Event) -> TicketCheckResult:
360360
# NOTE: It doesn't work with the Docker setup for development, because we use fake domain then,
361361
and inside the container, the fake domain points to the container itself, not the host.
362362
"""
363-
if 'ticket_link' not in event.display_settings:
364-
logger.info('display_settings[ticket_link] is missing.')
365-
return TicketCheckResult.MISCONFIGURED
366-
base_url, organizer_slug, event_slug = extract_event_info_from_url(
367-
event.display_settings['ticket_link']
368-
)
369-
if not organizer_slug or not event_slug or not base_url:
370-
logger.info('display_settings[ticket_link] is not valid.')
371-
return TicketCheckResult.MISCONFIGURED
363+
# Use unified ticket base path and event slugs; no manual URL needed
364+
base_url = settings.EVENTYAY_TICKET_BASE_PATH
365+
# Normalize base URL to keep urljoin from dropping path segments
366+
if not base_url.endswith('/'):
367+
base_url = f'{base_url}/'
368+
organizer_slug = event.organizer.slug
369+
event_slug = event.slug
372370
check_payload = {'user_email': user.email}
373371
# call to ticket to check if user order ticket yet or not
374372
api_url = urljoin(base_url, f'api/v1/{organizer_slug}/{event_slug}/ticket-check')

app/eventyay/orga/forms/event.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -126,18 +126,6 @@ class EventForm(ReadOnlyFlag, I18nHelpText, JsonSubfieldMixin, I18nModelForm):
126126
),
127127
required=False,
128128
)
129-
ticket_link = forms.URLField(
130-
label=_('Event ticket shop URL'),
131-
help_text=_('Ticket shop link will be shown on event menu. '),
132-
widget=forms.TextInput(attrs={'placeholder': 'e.g: https://tickets-dev.eventyay.com/2024/wikimania/'}),
133-
required=False,
134-
)
135-
video_link = forms.URLField(
136-
label=_('Video Live URL'),
137-
help_text=('Online video link will be shown on event menu.'),
138-
widget=forms.TextInput(attrs={'placeholder': ' e.g: https://app.eventyay.com/video'}),
139-
required=False,
140-
)
141129
header_pattern = forms.ChoiceField(
142130
label=phrases.orga.event_header_pattern_label,
143131
help_text=phrases.orga.event_header_pattern_help_text,
@@ -351,8 +339,6 @@ class Meta:
351339
'use_feedback': 'feature_flags',
352340
'export_html_on_release': 'feature_flags',
353341
'html_export_url': 'display_settings',
354-
'ticket_link': 'display_settings',
355-
'video_link': 'display_settings',
356342
'header_pattern': 'display_settings',
357343
'meta_noindex': 'display_settings',
358344
}

app/eventyay/orga/templates/orga/settings/form.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,6 @@ <h2>{% translate "Settings" %}</h2>
8080
{{ form.use_feedback.as_field_group }}
8181
{{ form.export_html_on_release.as_field_group }}
8282
{{ form.html_export_url.as_field_group }}
83-
{{ form.ticket_link.as_field_group }}
84-
{{ form.video_link.as_field_group }}
8583
</fieldset>
8684
<fieldset>
8785
<legend id="other-settings">{% translate "Other settings" %}</legend>

0 commit comments

Comments
 (0)