diff --git a/teamsnap/lineup/templates/lineup/multiple_edit.html b/teamsnap/lineup/templates/lineup/edit.html similarity index 100% rename from teamsnap/lineup/templates/lineup/multiple_edit.html rename to teamsnap/lineup/templates/lineup/edit.html diff --git a/teamsnap/lineup/urls.py b/teamsnap/lineup/urls.py index c5be8d8..6a2e9ee 100644 --- a/teamsnap/lineup/urls.py +++ b/teamsnap/lineup/urls.py @@ -16,7 +16,7 @@ urlpatterns = [ path( "/event//edit_lineup/", edit_lineup, - name="teamsnap_edit_multiple_lineups", + name="teamsnap_edit_lineup", ), path( "/multievent/choose", diff --git a/teamsnap/lineup/views.py b/teamsnap/lineup/views.py index 3c3491f..f631f2c 100644 --- a/teamsnap/lineup/views.py +++ b/teamsnap/lineup/views.py @@ -173,7 +173,7 @@ def edit_lineup(request, event_ids, team_id): } ) - return render(request, "lineup/multiple_edit.html", context={"contexts": contexts}) + return render(request, "lineup/edit.html", context={"contexts": contexts}) def submit_lineup(request, team_id, event_id): @@ -259,7 +259,7 @@ def multi_lineup_choose(request, team_id): formset = EventChooseFormset(request.POST) return redirect( - "teamsnap_edit_multiple_lineups", + "teamsnap_edit_lineup", team_id=team_id, event_ids=",".join(event_ids), ) diff --git a/teamsnap/urls.py b/teamsnap/urls.py index 971a548..0147fe7 100644 --- a/teamsnap/urls.py +++ b/teamsnap/urls.py @@ -2,15 +2,7 @@ from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns from django.urls import include, path from .provider import TeamsnapProvider -from .views import ( - PreferencesFormView, - dashboard, - edit_lineup, - multi_lineup_choose, - schedule_view, - submit_lineup, - view_event, -) +from .views import PreferencesFormView, dashboard, schedule_view, view_event urlpatterns = default_urlpatterns(TeamsnapProvider) @@ -25,25 +17,5 @@ urlpatterns += [ view_event, name="teamsnap_view_event", ), - path( - "/schedule/edit_lineup/", - edit_lineup, - name="teamsnap_edit_lineup", - ), - path( - "/event//submit_lineup/", - submit_lineup, - name="teamsnap_submit_lineup", - ), - path( - "/event//edit_lineup/", - edit_lineup, - name="teamsnap_edit_multiple_lineups", - ), - path( - "/multievent/choose", - multi_lineup_choose, - name="teamsnap_choose_multiple_lineups", - ), path("", include("teamsnap.lineup.urls")), ] diff --git a/teamsnap/views.py b/teamsnap/views.py index 0edc0c9..69cbe85 100644 --- a/teamsnap/views.py +++ b/teamsnap/views.py @@ -359,7 +359,7 @@ def edit_lineup(request, event_ids, team_id): } ) - return render(request, "lineup/multiple_edit.html", context={"contexts": contexts}) + return render(request, "lineup/edit.html", context={"contexts": contexts}) def dashboard(request, team_id=None): @@ -482,7 +482,7 @@ def multi_lineup_choose(request, team_id): formset = EventChooseFormset(request.POST) return redirect( - "teamsnap_edit_multiple_lineups", + "teamsnap_edit_lineup", team_id=team_id, event_ids=",".join(event_ids), )