diff --git a/AKPlanning/urls.py b/AKPlanning/urls.py index 2386721cbb5bc08f4aa84e1f77a5d0264cb8cfc4..cdbbea559617339113a51427b7b138417680b582 100644 --- a/AKPlanning/urls.py +++ b/AKPlanning/urls.py @@ -13,10 +13,10 @@ Including another URLconf 1. Import the include() function: from django.urls import include, path 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ +import debug_toolbar from django.apps import apps from django.contrib import admin from django.urls import path, include -import debug_toolbar urlpatterns = [ path('admin/', admin.site.urls), diff --git a/AKSubmission/urls.py b/AKSubmission/urls.py index e22ffdfda26cc219511ba64b0688803c08dc1e5e..213ea0e1a4fcd0eb3c4c1fad15bf884d23b67029 100644 --- a/AKSubmission/urls.py +++ b/AKSubmission/urls.py @@ -12,8 +12,6 @@ urlpatterns = [ path('ak/<int:pk>/', views.AKDetailView.as_view(), name='ak_detail'), path('ak/<int:pk>/history/', views.AKHistoryView.as_view(), name='ak_history'), path('ak/<int:pk>/edit/', views.AKEditView.as_view(), name='ak_edit'), - path('ak/<int:pk>/interest/', views.AKInterestView.as_view(), name='inc_interest'), - path('ak/<int:pk>/overview_interest/', views.AKOverviewInterestView.as_view(), name='overview_inc_interest'), path('ak/<int:pk>/add_slot/', views.AKSlotAddView.as_view(), name='akslot_add'), path('ak/<int:pk>/add_message/', views.AKAddOrgaMessageView.as_view(), name='akmessage_add'), path('akslot/<int:pk>/edit/', views.AKSlotEditView.as_view(), name='akslot_edit'), diff --git a/AKSubmission/views.py b/AKSubmission/views.py index e1844787a1fab0fdd8bf2fe549db37d125b1606d..077005e2b591daa9230c175367672520064bb540 100644 --- a/AKSubmission/views.py +++ b/AKSubmission/views.py @@ -10,7 +10,7 @@ from django.urls import reverse_lazy from django.utils.datetime_safe import datetime from django.utils.translation import gettext_lazy as _ from django.views import View -from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView, RedirectView, TemplateView +from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView, TemplateView from AKModel.availability.models import Availability from AKModel.models import AK, AKCategory, AKTag, AKOwner, AKSlot, AKTrack, AKOrgaMessage @@ -286,29 +286,6 @@ class AKEditView(EventSlugMixin, EventInactiveRedirectMixin, UpdateView): return super_form_valid -class AKInterestView(RedirectView): - permanent = False - pattern_name = 'submit:ak_detail' - - def get(self, request, *args, **kwargs): - # Increase interest counter for given AK - ak = get_object_or_404(AK, pk=kwargs['pk']) - if ak.event.active: - ak.increment_interest() - messages.add_message(self.request, messages.SUCCESS, _("Interest saved")) - return super().get(request, *args, **kwargs) - - -# when the interest increase request comes from the AK overview page, redirect to that instead of the AK overview page -class AKOverviewInterestView(AKInterestView): - pattern_name = 'submit:submission_overview' - - def get_redirect_url(self, *args, **kwargs): - # No PK needed for overview page of all AKs - del kwargs['pk'] - return super().get_redirect_url(*args, **kwargs) - - class AKOwnerCreateView(EventSlugMixin, EventInactiveRedirectMixin, CreateView): model = AKOwner template_name = 'AKSubmission/akowner_create_update.html'