common unified admin page

Author: Saksham-Sirohi

app/eventyay/control/navigation.py

@@ -475,10 +475,11 @@ def get_organizer_navigation(request):
             {
                 'label': _('Teams'),
                 'url': reverse(
-                    'control:organizer.teams',
+                    'eventyay_common:organizer.update',
                     kwargs={'organizer': request.organizer.slug},
-                ),
-                'active': 'organizer.team' in url.url_name and url.namespace == 'control',
+                )
+                + '?section=permissions',
+                'active': False,
                 'icon': 'group',
             }
         )

app/eventyay/control/templates/pretixcontrol/admin/users/form.html

@@ -51,7 +51,7 @@ <h1>{% trans "User" %} {{ user.email }}</h1>
                     <ul>
                         {% for t in teams %}
                             <li>
-                                <a href='{% url "control:organizer.team" organizer=t.organizer.slug team=t.pk %}'>
+                                <a href='{% url "eventyay_common:organizer.update" organizer=t.organizer.slug %}?section=permissions&team={{ t.pk }}'>
                                     {% blocktrans trimmed with team=t.name organizer=t.organizer.name %}
                                         Team "{{ team }}" of organizer "{{ organizer }}"
                                     {% endblocktrans %}

app/eventyay/control/templates/pretixcontrol/event/fragment_info_box.html

@@ -13,7 +13,7 @@ <h3 class="panel-title">
             {% trans "Teams of the organizer are" %} 
             <span></span>
           {% for id, name in organizer_teams %}
-            <strong><a href="{% url 'control:organizer.team' request.organizer.slug id %}">{{ name }}</a></strong>{% if not forloop.last %}, {% endif %}
+            <strong><a href="{% url 'eventyay_common:organizer.update' organizer=request.organizer.slug %}?section=permissions&team={{ id }}">{{ name }}</a></strong>{% if not forloop.last %}, {% endif %}
           {% endfor %}
         </div>
     </div>

app/eventyay/control/templates/pretixcontrol/organizers/team_delete.html

@@ -208,31 +208,6 @@
         organizer_views.gate_view.GateDeleteView.as_view(),
         name='organizer.gate.delete',
     ),
-    url(
-        r'^organizer/(?P<organizer>[^/]+)/teams$',
-        organizer_views.team_view.TeamListView.as_view(),
-        name='organizer.teams',
-    ),
-    url(
-        r'^organizer/(?P<organizer>[^/]+)/team/add$',
-        organizer_views.team_view.TeamCreateView.as_view(),
-        name='organizer.team.add',
-    ),
-    url(
-        r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/$',
-        organizer_views.team_view.TeamMemberView.as_view(),
-        name='organizer.team',
-    ),
-    url(
-        r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/edit$',
-        organizer_views.team_view.TeamUpdateView.as_view(),
-        name='organizer.team.edit',
-    ),
-    url(
-        r'^organizer/(?P<organizer>[^/]+)/team/(?P<team>[^/]+)/delete$',
-        organizer_views.team_view.TeamDeleteView.as_view(),
-        name='organizer.team.delete',
-    ),
     url(
         r'^organizer/(?P<organizer>[^/]+)/slugrng',
         main.SlugRNG.as_view(),

app/eventyay/control/templates/pretixcontrol/organizers/team_edit.html

@@ -2,14 +2,7 @@
 from .gate_view import GateListView  # NOQA: F401
 from .gift_card_view import GiftCardDetailView  # NOQA: F401
 from .organizer_detail_view_mixin import OrganizerDetailViewMixin  # NOQA: F401
-from .organizer_view import OrganizerTeamView  # NOQA: F401
-from .team_view import (  # NOQA: F401
-    TeamCreateView,
-    TeamDeleteView,
-    TeamListView,
-    TeamMemberView,
-    TeamUpdateView,
-)
+from . import organizer_view  # NOQA: F401
 from .web_hook_view import (  # NOQA: F401
     WebHookCreateView,
     WebHookListView,

app/eventyay/control/templates/pretixcontrol/organizers/team_members.html

@@ -283,13 +283,6 @@ def post(self, request, *args, **kwargs):
             return self.get(request)
 
 
-class OrganizerTeamView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, DetailView):
-    model = Organizer
-    template_name = 'pretixcontrol/organizers/teams.html'
-    permission = 'can_change_permissions'
-    context_object_name = 'organizer'
-
-
 class OrganizerDetail(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, ListView):
     model = Event
     template_name = 'pretixcontrol/organizers/detail.html'