From 8b9710a4524c60c2722d9a014aff8d7fb9e17380 Mon Sep 17 00:00:00 2001 From: Karl Engelhardt Date: Thu, 28 Apr 2022 16:10:26 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=9C=A8=20Add=20shortlinks=20for=20?= =?UTF-8?q?govplan=20updates"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fc64045cdeae95b07079dbfde9179e98e4b298ba. --- froide_govplan/models.py | 9 --------- froide_govplan/urls.py | 6 ------ froide_govplan/views.py | 12 +----------- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/froide_govplan/models.py b/froide_govplan/models.py index 28227a7..ea481d0 100644 --- a/froide_govplan/models.py +++ b/froide_govplan/models.py @@ -350,15 +350,6 @@ class GovernmentPlanUpdate(models.Model): def get_absolute_domain_url(self): return settings.SITE_URL + self.get_absolute_url() - def get_absolute_short_url(self): - return reverse( - "govplan:planupdate_shortlink", - kwargs={"gov": self.plan.government.slug, "obj_id": self.pk}, - ) - - def get_absolute_domain_short_url(self): - return settings.SITE_URL + self.get_absolute_short_url() - def get_url_domain(self): return urlparse(self.url).netloc or None diff --git a/froide_govplan/urls.py b/froide_govplan/urls.py index 88cabae..b25a56f 100644 --- a/froide_govplan/urls.py +++ b/froide_govplan/urls.py @@ -8,7 +8,6 @@ from .views import ( GovPlanSectionDetailOGView, GovPlanSectionDetailView, search, - update_shortlink, ) app_name = "govplan" @@ -40,9 +39,4 @@ urlpatterns = [ GovPlanSectionDetailOGView.as_view(), name="section_og", ), - path( - pgettext_lazy("url part", "/u//"), - update_shortlink, - name="planupdate_shortlink", - ), ] diff --git a/froide_govplan/views.py b/froide_govplan/views.py index 0cbd88e..fd896c0 100644 --- a/froide_govplan/views.py +++ b/froide_govplan/views.py @@ -5,12 +5,7 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import DetailView, UpdateView from .forms import GovernmentPlanUpdateProposalForm -from .models import ( - Government, - GovernmentPlan, - GovernmentPlanSection, - GovernmentPlanUpdate, -) +from .models import Government, GovernmentPlan, GovernmentPlanSection class GovernmentMixin: @@ -137,8 +132,3 @@ def search(request): return render( request, "froide_govplan/plugins/card_cols.html", {"object_list": plans} ) - - -def update_shortlink(request, gov, obj_id): - obj = get_object_or_404(GovernmentPlanUpdate, plan__government__slug=gov, pk=obj_id) - return redirect(obj)