Merge branch 'enext' into fix/talk-permissions-clarity

Author: mariobehling

README.rst

@@ -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
@@ -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**:
 

app/eventyay/agenda/templates/agenda/fragment_nav.html

@@ -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 %}
@@ -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>
@@ -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>

app/eventyay/agenda/templates/agenda/schedule.xml

@@ -1,7 +1,7 @@
 {% load xmlescape %}<?xml version='1.0' encoding='utf-8' ?>
-<!-- Made with love by pretalx v{{ version }}. -->
+<!-- Made with love by eventyay v{{ version }}. -->
 <schedule>
-    <generator name="pretalx" version="{{ version }}" />
+    <generator name="eventyay" version="{{ version }}" />
     <version>{{ schedule.version|xmlescape }}</version>
     <conference>
         <title>{{ event.name|xmlescape }}</title>

app/eventyay/agenda/urls.py

@@ -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(),
@@ -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',
     ),

app/eventyay/agenda/views/schedule.py

@@ -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)

talk/src/pretalx/api/documentation.py app/eventyay/api/documentation.pytalk/src/pretalx/api/documentation.py renamed to app/eventyay/api/documentation.py

@@ -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):
@@ -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."
             ),
         },
@@ -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."
             ),
@@ -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",
@@ -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",
@@ -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."
             ),
         },
@@ -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. "
             ),
         },

talk/src/pretalx/api/exceptions.py app/eventyay/api/exceptions.pytalk/src/pretalx/api/exceptions.py renamed to app/eventyay/api/exceptions.py

@@ -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():
 

talk/src/pretalx/api/filters/review.py app/eventyay/api/filters/review.pytalk/src/pretalx/api/filters/review.py renamed to app/eventyay/api/filters/review.py

@@ -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():
 

talk/src/pretalx/api/filters/schedule.py app/eventyay/api/filters/schedule.pytalk/src/pretalx/api/filters/schedule.py renamed to app/eventyay/api/filters/schedule.py

@@ -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):