Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
a2a1c49
Translated using Weblate (Chinese (Traditional Han script))
Sep 14, 2025
6b51662
Translated using Weblate (Chinese (Traditional Han script))
Supaplextw Sep 15, 2025
131c921
Translated using Weblate (Polish (pl_INFORMAL))
PINGWINIxPLa Sep 30, 2025
3a297a4
Added translation using Weblate (Persian)
abbasdp Oct 4, 2025
fef8ae3
Added translation using Weblate (Indonesian)
mariobehling Oct 8, 2025
74c3335
Added translation using Weblate (Japanese)
mariobehling Oct 8, 2025
5071335
Added translation using Weblate (Korean)
mariobehling Oct 8, 2025
1351deb
Added translation using Weblate (Malay)
mariobehling Oct 8, 2025
69f73ce
Added translation using Weblate (Thai)
mariobehling Oct 8, 2025
3531e00
Added translation using Weblate (Vietnamese)
mariobehling Oct 8, 2025
c380b53
i18n(translations): update localized strings from Weblate
Oct 9, 2025
b5baaf1
i18n(translations): update localized strings from Weblate
Supaplextw Oct 9, 2025
5c78417
HTTP 500 error when accessing Orders Export page
ArnavBallinCode Nov 13, 2025
f89f964
Fix similar export bug in organizer.py
ArnavBallinCode Nov 13, 2025
009f9e1
refactor: sourcery suggested so
ArnavBallinCode Nov 13, 2025
417c745
fix: add JSON_FIELD_AVAILABLE setting and fix Event.items reference
ArnavBallinCode Nov 14, 2025
b261f08
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 14, 2025
fe447da
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 14, 2025
3da5c3d
Merge branch 'enext' into fix/order-export-500-clean
mariobehling Nov 14, 2025
882e917
fix: preserve partial form data and rename items to products
ArnavBallinCode Nov 14, 2025
e7d3afa
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 14, 2025
75255dc
Speaker acceptance email confirmation link returning 500 error
ArnavBallinCode Nov 15, 2025
53443bd
refactoring as said by copilot to use cleaner dispatch pattern for p…
ArnavBallinCode Nov 15, 2025
7b10f28
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 15, 2025
bf481dc
Revert to manual initialization - correct fix
ArnavBallinCode Nov 15, 2025
6fd06dd
..
ArnavBallinCode Nov 15, 2025
e38a7f6
Merge branch 'enext' into fix/order-export-500-clean
mariobehling Nov 15, 2025
f932d03
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 15, 2025
12840b4
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 16, 2025
f416461
fix(ui) unify navigation button styling across Tickets and Talk views…
ArnavBallinCode Nov 16, 2025
38f84d7
fix(ui): prevent sidebar auto-collapse on navigation (#1306)
ArnavBallinCode Nov 16, 2025
a6636c2
Chore: remove ticket/video URL fields (#1309)
Saksham-Sirohi Nov 16, 2025
30c28a8
remove logout button on video component (#1313)
Saksham-Sirohi Nov 16, 2025
b7856b5
PostgreSQL syntax error in Room permission query (#1314)
suhailnadaf509 Nov 16, 2025
27d425e
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 17, 2025
7ca8ef7
fix unable to save config (#1295)
Saksham-Sirohi Nov 17, 2025
6266c3f
Refactored the entire system to replace all legacy 'pretix/pretalx' r…
ArnavBallinCode Nov 17, 2025
d6f5a67
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 17, 2025
f1ba6a7
bug: enable browser timezone for orders and mails optimizing filters …
Saksham-Sirohi Nov 18, 2025
021c73b
chore(deps): update reportlab requirement from ==4.2.* to ==4.4.* (#1…
dependabot[bot] Nov 18, 2025
7e65d34
chore: remove duplicate orga settings (#1320)
Saksham-Sirohi Nov 18, 2025
06b4377
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 18, 2025
a81a1e0
chore(deps): update stripe requirement from ==13.2.* to ==14.0.* (#1327)
dependabot[bot] Nov 19, 2025
018f1ac
chore(deps): update sentry-sdk requirement from ==2.44.* to ==2.45.* …
dependabot[bot] Nov 19, 2025
3963cc7
Resolve Sidebar Icon Layout Shift (#1319)
ArnavBallinCode Nov 20, 2025
4c92d7e
Fix: socialauth URLs were not resolved (#1324)
hongquan Nov 20, 2025
a18c3f0
Merge branch 'enext' into fix/order-export-500-clean
mariobehling Nov 20, 2025
cdaeb4b
removed copilot sugguestions
ArnavBallinCode Nov 20, 2025
8cda595
chore: add translations korean and indonesian (#1330)
Saksham-Sirohi Nov 20, 2025
16d750b
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 21, 2025
87e560f
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 21, 2025
84dbee0
feature: added hidden rooms and ensure sync (#1184)
Saksham-Sirohi Nov 21, 2025
978e73a
chore(deps): update geoip2 requirement from ==4.* to ==5.* (#1333)
dependabot[bot] Nov 22, 2025
8d4d440
chore(deps): update redis requirement from ==7.0.* to ==7.1.* (#1329)
dependabot[bot] Nov 22, 2025
3efab3b
Fix: HTTP 500 error handling during room deletion (#1280)
ArnavBallinCode Nov 22, 2025
54f1945
Fix: gift card 500 error (#1260)
ArnavBallinCode Nov 22, 2025
ab3731d
Fix CSV Export Returns 500 Error (#1267)
prayag78 Nov 22, 2025
67d2ac5
Export orders with Wikimedia username (#1332)
hongquan Nov 22, 2025
0011de0
bug: image rescaling fix (#1292)
Saksham-Sirohi Nov 23, 2025
c32bcf6
Merge branch 'enext' into fix/order-export-500-clean
mariobehling Nov 23, 2025
70a8496
fix(ui): match top menu bar between eventyay talk and eventyay ticket…
prayag78 Nov 23, 2025
165591d
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 23, 2025
0d47b00
add polls to default_feature_flags (#1337)
suhailnadaf509 Nov 23, 2025
b59ae4c
chore(deps): update sentry-sdk requirement from ==2.45.* to ==2.46.* …
dependabot[bot] Nov 24, 2025
de46975
Delete URL redirection for legacy eventyay-xx websites (#1338)
hongquan Nov 24, 2025
c2a07de
fix: resolve PDF download issues (#1256)
ArnavBallinCode Nov 24, 2025
f1029e2
Merge branch 'enext' into fix/order-export-500-clean
ArnavBallinCode Nov 24, 2025
858357a
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 24, 2025
4a8e658
chore(deps): update django-phonenumber-field requirement (#1347)
dependabot[bot] Nov 25, 2025
2a386ae
chore(deps): update django-countries requirement from ==8.1.* to ==8.…
dependabot[bot] Nov 25, 2025
11ce87b
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
Sak1012 Nov 25, 2025
31b3b13
Merge branch 'enext' into fix/order-export-500-clean
Sak1012 Nov 25, 2025
563ce6b
fix(badge): add missing item to product rename in badge view (#1349)
Sak1012 Nov 25, 2025
b0d2953
fix rooms not working on video (#1339)
Saksham-Sirohi Nov 25, 2025
ed8b429
fix(500): item to product renames (#1350)
Sak1012 Nov 25, 2025
7e66527
Show Wikimedia username in ticket checkout page (#1351)
hongquan Nov 27, 2025
7962edb
Fix translation weblate integration (#1353)
Sak1012 Nov 27, 2025
246cb3f
chore(deps): bump pydantic from 2.12.4 to 2.12.5 (#1354)
dependabot[bot] Nov 27, 2025
6730f31
refactor: remove JSON_FIELD_AVAILABLE checks from exporters
ArnavBallinCode Nov 27, 2025
19a0cbe
Fix issue #1276: Remove indentation from URLs in email templates
ArnavBallinCode Nov 27, 2025
1492848
Merge branch 'enext' into fix/order-export-500-clean
mariobehling Nov 28, 2025
c1fecb6
Merge remote-tracking branch 'main/enext' into translated
Sak1012 Nov 28, 2025
94791cc
Merge pull request #1258 from ArnavBallinCode/fix/order-export-500-clean
hpdang Nov 28, 2025
385875a
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 28, 2025
57385bd
fix: Update Bank Transfer text and fix broken payment docs link (Fixe…
MohammedAnasNathani Nov 28, 2025
2c3b4be
Merge branch 'enext' into translated
Sak1012 Nov 28, 2025
2bc0cfb
Merge pull request #1355 from fossasia/translated
mariobehling Nov 28, 2025
11ab1d9
fix: Resolve multiple exporter failures after database migration (#1321)
ArnavBallinCode Nov 28, 2025
a435789
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 28, 2025
1b95c01
chore: fixed featured sessions and 500 errors on sessions and reviews…
Saksham-Sirohi Nov 28, 2025
b6deb48
Fix: Replace 'CfP' with 'Call for Papers' to fix translations #997 (#…
krishmishra846-alt Nov 28, 2025
0e787fe
move api app (#1335)
Gagan-Ram Nov 28, 2025
c47d6cf
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
mariobehling Nov 28, 2025
3ba8c33
Fixes 404 and url rename (#1235)
Saksham-Sirohi Nov 28, 2025
d5cf4da
i18n(translations): update localized strings from Weblate
SantosSi Nov 27, 2025
4d3509a
added talk endpoint (#1362)
Saksham-Sirohi Nov 28, 2025
9741041
Fix CSS not updating after color settings change (#1360)
prayag78 Nov 28, 2025
5619f8b
Merge branch 'enext' into translated
Sak1012 Nov 29, 2025
61b053f
fix(translations): remove old translation files and merge redundant f…
Sak1012 Nov 29, 2025
bbd03e0
Merge pull request #1361 from fossasia/translated
mariobehling Nov 29, 2025
f9eee4f
Fix: Hide unstable component selection options in Create Event page
krishmishra846-alt Nov 29, 2025
1087bc4
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
ArnavBallinCode Nov 29, 2025
8d3ed18
fix(locale): Update gettext location comments in the locale file (#1372)
Sak1012 Nov 30, 2025
aff478a
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
547a058
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
070d9cf
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
f65a67a
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
36ef340
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
5a745e1
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
ac2e695
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
61cba87
i18n(translations): update localized strings from Weblate
weblate Nov 29, 2025
d342560
i18n(translations): update localized strings from Weblate
Nov 29, 2025
372214e
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
30fccdf
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
013226c
i18n(translations): update localized strings from Weblate
Nov 30, 2025
c63b658
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
8f641e4
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
8b0bbf5
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
cb2d07b
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
e9d81e2
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
7c5ae9b
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
38da9fd
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
7ae98c3
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
d7233c1
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
432efd2
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
de782bf
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
6201f0c
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
c9110ee
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
82b9894
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
57b9768
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
a4486bc
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
17cdd2a
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
b645a97
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
faaf649
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
dd4cead
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
d2b12a5
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
9ba012c
Fix: Hide unpublished sessions from talk component menu (#1318)
ArnavBallinCode Nov 30, 2025
515ae57
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
c41fe17
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
cc02379
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
a3e0da4
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
e2cb4da
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
f2adfc5
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
c342a4b
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
8a405ac
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
8784ccf
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
6892b32
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
b0a0793
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
2d80f39
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
3580b64
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
418ebea
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
5f72264
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
0645732
Update README with new repository links
mariobehling Nov 30, 2025
5919fd6
i18n(translations): update localized strings from Weblate
weblate Nov 30, 2025
c51830a
Merge remote-tracking branch 'origin/enext' into enext
weblate Nov 30, 2025
32a6c01
Merge pull request #1387 from fossasia/translated
mariobehling Nov 30, 2025
25dbc11
Merge branch 'enext' into fix/issue-1276-speaker-acceptance-link-oof
Sak1012 Dec 1, 2025
073f140
Remove redundant self.request/args/kwargs assignment in SubmissionCon…
ArnavBallinCode Dec 1, 2025
b00f5a5
Merge pull request #1300 from ArnavBallinCode/fix/issue-1276-speaker-…
hpdang Dec 1, 2025
408180c
fix(translations): Add missing languages (#1396)
Sak1012 Dec 1, 2025
7cd80c2
fix(translation): Move inline js to static file (#1397)
Sak1012 Dec 1, 2025
cb63c6e
chore(deps): update beautifulsoup4 requirement from ==4.12.* to ==4.1…
dependabot[bot] Dec 1, 2025
a37680c
chore(deps): update celery requirement from ==5.4.* to ==5.6.* (#1400)
dependabot[bot] Dec 1, 2025
0d41a22
fix navigation hover shifting by adding default transparent bottom bo…
aliciacilmora Dec 1, 2025
727bead
fix(voucher): Fix typo to return `True`
Sak1012 Dec 1, 2025
9a0cbb4
fix(product): item to product rename in CartPosition
Sak1012 Dec 1, 2025
bdcb001
Merge branch 'enext' into enext
mariobehling Dec 1, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
eventyay-tickets (ENext)
========================

.. image:: https://codecov.io/gh/fossasia/eventyay-tickets/branch/master/graph/badge.svg
.. image:: https://codecov.io/gh/fossasia/eventyay/branch/enext/graph/badge.svg
:target: https://codecov.io/gh/pretix/pretix

Project status & release cycle
Expand Down Expand Up @@ -41,13 +41,13 @@ Getting Started

.. code-block:: bash

git clone https://github.com/fossasia/eventyay-tickets.git
git clone https://github.com/fossasia/eventyay.git

2. **Enter the project directory and app directory**:

.. code-block:: bash

cd eventyay-tickets/app
cd eventyay/app

3. **Switch to the `enext` branch**:

Expand Down
21 changes: 12 additions & 9 deletions app/eventyay/agenda/templates/agenda/fragment_nav.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
{% load i18n %}
{% load safelink %}
{% load event_tags %}

<a href="{% url 'presale:event.index' event=request.event.slug organizer=request.event.organizer.slug %}" class="header-tab">
<i class="fa fa-ticket"></i> {% translate "Tickets" %}
</a>
{% if schedule or request.event.current_schedule %}
<a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
<a href="{{ request.event.urls.schedule }}" class="header-tab {% if '/schedule/' in request.path_info %}active{% endif %}">
<i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
</a>
{% endif %}
{% if request.event.display_settings.schedule_display != "list" %}
<a href="{{ request.event.urls.talks }}" class="header-tab {% if "/talk/" in request.path_info %} active{% endif %}">
<i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
</a>
{% endif %}
{% if schedule or request.event.current_schedule %}
<a href="{{ request.event.urls.speakers }}" class="header-tab {% if "/speaker/" in request.path_info %} active{% endif %}">
{% if request.event.display_settings.schedule_display != "list" %}
<a href="{{ request.event.urls.talks }}" class="header-tab {% if '/sessions/' in request.path_info %} active{% endif %}">
<i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
</a>
{% endif %}
{% endif %}
{% if request.event.speakers.exists %}
<a href="{{ request.event.urls.speakers }}" class="header-tab {% if '/speakers/' in request.path_info %} active{% endif %}">
<i class="fa fa-group"></i> {{ phrases.schedule.speakers }}
</a>
{% endif %}
Expand All @@ -27,7 +30,7 @@

{% with cfp=request.event.cfp %}
{% if cfp.is_open or access_code.is_valid %}
<a class="header-tab {% if "/cfp" in request.path_info %} active{% endif %}"
<a class="header-tab {% if '/cfp' in request.path_info %} active{% endif %}"
href="{% url 'cfp:event.start' event=request.event.slug organizer=request.event.organizer.slug %}">
<i class="fa fa-bullhorn"></i> {% translate "Call for Speakers" %}
</a>
Expand All @@ -38,6 +41,6 @@
{% endif %}
{% endwith %}

<a id="join-event-link" href='{% url "agenda:event.onlinevideo.join" organizer=request.event.organizer.slug event=request.event.slug %}' class="header-tab">
<a id="join-event-link" href="{% url 'agenda:event.onlinevideo.join' organizer=request.event.organizer.slug event=request.event.slug %}" class="header-tab">
<i class="fa fa-video-camera"></i> {% translate "Join online video" %}
</a>
17 changes: 8 additions & 9 deletions app/eventyay/agenda/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,20 @@ def get_schedule_urls(regex_prefix, name_prefix=''):
),
*get_schedule_urls('schedule'),
*get_schedule_urls('schedule/v/<version>', 'versioned-'),
path('sneak/', featured.sneakpeek_redirect, name='oldsneak'),
path('featured/', featured.FeaturedView.as_view(), name='featured'),
path('speaker/', speaker.SpeakerList.as_view(), name='speakers'),
path('speakers/', speaker.SpeakerList.as_view(), name='speakers'),
path(
'speaker/avatar.svg',
'speakers/avatar.svg',
speaker.empty_avatar_view,
name='speakers.avatar',
),
path(
'speaker/by-id/<int:pk>/',
'speakers/by-id/<int:pk>/',
speaker.SpeakerRedirect.as_view(),
name='speaker.redirect',
),
path('talk/', schedule.ScheduleView.as_view(), name='talks'),
path('talk/<slug>/', talk.TalkView.as_view(), name='talk'),
path('sessions/', schedule.ScheduleView.as_view(), name='talks'),
path('talk/<slug>/', talk.TalkView.as_view(), name='talk.detail'),
path(
'talk/<slug>/og-image',
talk.TalkSocialMediaCard.as_view(),
Expand All @@ -96,17 +95,17 @@ def get_schedule_urls(regex_prefix, name_prefix=''):
name='review',
),
path(
'speaker/<code>/',
'speakers/<code>/',
speaker.SpeakerView.as_view(),
name='speaker',
),
path(
'speaker/<code>/og-image',
'speakers/<code>/og-image',
speaker.SpeakerSocialMediaCard.as_view(),
name='speaker-social',
),
path(
'speaker/<code>/talks.ics',
'speakers/<code>/talks.ics',
speaker.SpeakerTalksIcalView.as_view(),
name='speaker.talks.ical',
),
Expand Down
2 changes: 1 addition & 1 deletion app/eventyay/agenda/views/schedule.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def my_exporters(self):

@context
def show_talk_list(self):
return self.request.path.endswith('/talk/') or self.request.event.display_settings['schedule'] == 'list'
return self.request.path.endswith('/sessions/') or self.request.event.display_settings['schedule'] == 'list'


@cache_page(60 * 60 * 24)
Expand Down
16 changes: 7 additions & 9 deletions app/eventyay/agenda/views/talk.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,15 +360,13 @@ def check_user_owning_ticket(user: User, event: Event) -> TicketCheckResult:
# NOTE: It doesn't work with the Docker setup for development, because we use fake domain then,
and inside the container, the fake domain points to the container itself, not the host.
"""
if 'ticket_link' not in event.display_settings:
logger.info('display_settings[ticket_link] is missing.')
return TicketCheckResult.MISCONFIGURED
base_url, organizer_slug, event_slug = extract_event_info_from_url(
event.display_settings['ticket_link']
)
if not organizer_slug or not event_slug or not base_url:
logger.info('display_settings[ticket_link] is not valid.')
return TicketCheckResult.MISCONFIGURED
# Use unified ticket base path and event slugs; no manual URL needed
base_url = settings.EVENTYAY_TICKET_BASE_PATH
# Normalize base URL to keep urljoin from dropping path segments
if not base_url.endswith('/'):
base_url = f'{base_url}/'
organizer_slug = event.organizer.slug
event_slug = event.slug
check_payload = {'user_email': user.email}
# call to ticket to check if user order ticket yet or not
api_url = urljoin(base_url, f'api/v1/{organizer_slug}/{event_slug}/ticket-check')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from drf_spectacular.types import OpenApiTypes
from drf_spectacular.utils import OpenApiParameter

from pretalx.mail.models import MailTemplateRoles
from eventyay.base.models.mail import MailTemplateRoles


def build_expand_docs(*params):
Expand Down Expand Up @@ -58,7 +58,7 @@ def postprocess_schema(result, generator, request, public):
{
"name": "teams",
"description": (
"Access permissions for events are organised in teams within an organiser. "
"Access permissions for events are organised in teams within an organizer. "
"This is the only API endpoint that does not use the event setting on your access token, as teams exist outside the event structure."
),
},
Expand All @@ -78,14 +78,14 @@ def postprocess_schema(result, generator, request, public):
},
{
"name": "speakers",
"description": "Speakers can currently only updated, not created or deleted, as a speaker refers to a user object, and users can only be deleted by administrators. Organisers will see additional fields in the API, in line with the response to the update actions.",
"description": "Speakers can currently only updated, not created or deleted, as a speaker refers to a user object, and users can only be deleted by administrators. organizers will see additional fields in the API, in line with the response to the update actions.",
},
{
"name": "schedules",
"description": (
"In pretalx, an event’s schedule is versioned, and each version is a schedule object in the API. "
"In addition to the normal ID based routing, you can use the `latest` shortcut to see the current public schedule, "
"and as organiser, the `wip` shortcut will show the current unpublished working copy. "
"and as organizer, the `wip` shortcut will show the current unpublished working copy. "
"As retrieving the fully expanded endpoint is expensive on the pretalx side, "
"consider using the redirect offered at ``by-version/?version=latest`` to check for a new release."
),
Expand All @@ -100,7 +100,7 @@ def postprocess_schema(result, generator, request, public):
},
{
"name": "rooms",
"description": "Rooms are part of conference schedules. Only once the conference schedule is public will the rooms API be available to unauthenticated users. Authenticated organisers will see additional fields in the API, in line with the create and update actions.",
"description": "Rooms are part of conference schedules. Only once the conference schedule is public will the rooms API be available to unauthenticated users. Authenticated organizers will see additional fields in the API, in line with the create and update actions.",
},
{
"name": "submission-types",
Expand All @@ -112,7 +112,7 @@ def postprocess_schema(result, generator, request, public):
},
{
"name": "tags",
"description": "Tags are currently only used in the organiser backend and not publicly. As such, all tag endpoints require authentication.",
"description": "Tags are currently only used in the organizer backend and not publicly. As such, all tag endpoints require authentication.",
"externalDocs": {
"url": "https://docs.pretalx.org/user/sessions/#tags",
"description": "User documentation",
Expand All @@ -129,7 +129,7 @@ def postprocess_schema(result, generator, request, public):
{
"name": "questions",
"description": (
"The questions resource represents all fields created by organisers via the flexible “custom fields” model, "
"The questions resource represents all fields created by organizers via the flexible “custom fields” model, "
"with the answers available under the ``/answers/`` endpoint."
),
},
Expand All @@ -142,7 +142,7 @@ def postprocess_schema(result, generator, request, public):
{
"name": "answers",
"description": (
"The answers resource represents all data collected by organisers via the flexible “custom fields” model, which "
"The answers resource represents all data collected by organizers via the flexible “custom fields” model, which "
"allows for nearly arbitrary data collection from speakers or reviewers. "
),
},
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import django_filters
from django_scopes import scopes_disabled

from pretalx.person.models import User
from pretalx.submission.models import Review, Submission
from eventyay.base.models.auth import User
from eventyay.base.models.submission import Submission
from eventyay.base.models.review import Review

with scopes_disabled():

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import django_filters
from django_scopes import scopes_disabled

from pretalx.person.models import User
from pretalx.schedule.models import Room, Schedule, TalkSlot
from pretalx.submission.models import Submission
from eventyay.base.models.auth import User
from eventyay.base.models.schedule import Schedule
from eventyay.base.models.slot import TalkSlot
from eventyay.base.models.room import Room
from eventyay.base.models.submission import Submission

with scopes_disabled():

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from rest_framework import exceptions
from rest_framework.serializers import ModelSerializer

from pretalx.api.versions import get_api_version_from_request, get_serializer_by_version
from eventyay.api.versions import get_api_version_from_request, get_serializer_by_version


class ApiVersionException(exceptions.APIException):
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from rest_framework.permissions import BasePermission

from pretalx.person.rules import is_only_reviewer
from eventyay.talk_rules.person import is_only_reviewer

MODEL_PERMISSION_MAP = {
"list": "list",
Expand All @@ -22,7 +22,7 @@
class ApiPermission(BasePermission):

def get_permission_object(self, view, obj, request, detail=False):
return obj or getattr(request, "event", None) or request.organiser
return obj or getattr(request, "event", None) or request.organizer

def has_permission(self, request, view):
return self._has_permission(view, None, request)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from rest_flex_fields.serializers import FlexFieldsSerializerMixin

from pretalx.api.mixins import PretalxSerializer
from pretalx.api.versions import CURRENT_VERSIONS, register_serializer
from pretalx.submission.models import SubmitterAccessCode
from eventyay.api.mixins import PretalxSerializer
from eventyay.api.versions import CURRENT_VERSIONS, register_serializer
from eventyay.base.models.access_code import SubmitterAccessCode


@register_serializer(versions=CURRENT_VERSIONS)
Expand All @@ -20,11 +20,11 @@ class Meta:
)
expandable_fields = {
"track": (
"pretalx.api.serializers.submission.TrackSerializer",
"eventyay.api.serializers.submission.TrackSerializer",
{"read_only": True},
),
"submission_type": (
"pretalx.api.serializers.submission.SubmissionTypeSerializer",
"eventyay.api.serializers.submission.SubmissionTypeSerializer",
{"read_only": True},
),
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from django.db import transaction
from rest_framework.serializers import BooleanField, ModelSerializer

from pretalx.schedule.models import Availability
from eventyay.base.models.availability import Availability


class AvailabilitySerializer(ModelSerializer):
Expand Down
4 changes: 2 additions & 2 deletions app/eventyay/api/serializers/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def to_internal_value(self, data):

class PluginsField(Field):
def to_representation(self, obj):
from pretix.base.plugins import get_all_plugins
from eventyay.base.plugins import get_all_plugins

return sorted(
[
Expand Down Expand Up @@ -222,7 +222,7 @@ def validate_seat_category_mapping(self, value):
return {'seat_category_mapping': result}

def validate_plugins(self, value):
from pretix.base.plugins import get_all_plugins
from eventyay.base.plugins import get_all_plugins

plugins_available = {
p.module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,22 @@
SlugRelatedField,
)

from pretalx.api.mixins import PretalxSerializer
from pretalx.api.serializers.question import AnswerSerializer
from pretalx.api.serializers.room import AvailabilitySerializer
from pretalx.api.serializers.submission import ResourceSerializer
from pretalx.api.versions import LEGACY, register_serializer
from pretalx.person.models import SpeakerProfile, User
from pretalx.schedule.models import Availability, Room, Schedule, TalkSlot
from pretalx.submission.models import (
Answer,
AnswerOption,
Question,
Resource,
Review,
Submission,
SubmissionStates,
Tag,
)
from eventyay.api.mixins import PretalxSerializer
from eventyay.api.serializers.question import AnswerSerializer
from eventyay.api.serializers.room import AvailabilitySerializer
from eventyay.api.serializers.submission import ResourceSerializer
from eventyay.api.versions import LEGACY, register_serializer
from eventyay.base.models.profile import SpeakerProfile
from eventyay.base.models.auth import User
from eventyay.base.models.availability import Availability
from eventyay.base.models.question import Answer, AnswerOption, TalkQuestion
from eventyay.base.models.room import Room
from eventyay.base.models.schedule import Schedule
from eventyay.base.models.slot import TalkSlot
from eventyay.base.models.resource import Resource
from eventyay.base.models.review import Review
from eventyay.base.models.submission import Submission, SubmissionStates
from eventyay.base.models.tag import Tag


class LegacySubmitterSerializer(ModelSerializer):
Expand Down Expand Up @@ -342,7 +341,7 @@ class LegacyQuestionSerializer(ModelSerializer):
options = LegacyAnswerOptionSerializer(many=True, required=False)

class Meta:
model = Question
model = TalkQuestion
fields = (
"id",
"variant",
Expand Down Expand Up @@ -377,7 +376,7 @@ class LegacyAnswerSerializer(ModelSerializer):
required=False,
)
options = LegacyAnswerOptionSerializer(many=True, required=False)
question = LegacyQuestionSerializer(Question.objects.none())
question = LegacyQuestionSerializer(TalkQuestion.objects.none())

def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
Expand Down
Loading