From 44c34d2daaa315d5a419095f63ab9fd75b33f7e5 Mon Sep 17 00:00:00 2001 From: moanos Date: Tue, 17 Jun 2025 07:13:03 +0200 Subject: [PATCH] refactor: Remove non-bulma adoption detail --- src/fellchensammlung/models.py | 4 ---- .../bulma-partial-adoption-notice-minimal-map.html | 2 +- .../partials/bulma-partial-adoption-notice-minimal.html | 2 +- src/fellchensammlung/urls.py | 4 +--- src/fellchensammlung/views.py | 9 ++++----- 5 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/fellchensammlung/models.py b/src/fellchensammlung/models.py index 1dae66e..f9713f8 100644 --- a/src/fellchensammlung/models.py +++ b/src/fellchensammlung/models.py @@ -388,10 +388,6 @@ class AdoptionNotice(models.Model): """Returns the url to access a detailed page for the adoption notice.""" return reverse('adoption-notice-detail', args=[str(self.id)]) - def get_absolute_url_bulma(self): - """Returns the url to access a detailed page for the adoption notice.""" - return reverse('adoption-notice-detail-bulma', args=[str(self.id)]) - def get_report_url(self): """Returns the url to report an adoption notice.""" return reverse('report-adoption-notice', args=[str(self.id)]) diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html index bf0e5d7..1f86dc1 100644 --- a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html +++ b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html @@ -3,7 +3,7 @@

- {{ adoption_notice.name }} + {{ adoption_notice.name }}

diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html index 7a770cc..c15c554 100644 --- a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html +++ b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html @@ -4,7 +4,7 @@
diff --git a/src/fellchensammlung/urls.py b/src/fellchensammlung/urls.py index 18ac78e..03ba683 100644 --- a/src/fellchensammlung/urls.py +++ b/src/fellchensammlung/urls.py @@ -27,9 +27,7 @@ urlpatterns = [ # ex: /animal/5/add-photo path("tier//add-photo", views.add_photo_to_animal_bulma, name="animal-add-photo"), # ex: /adoption_notice/7/ - path("vermittlung//", views.adoption_notice_detail, name="adoption-notice-detail"), - path("bulma/vermittlung//", views.adoption_notice_detail_bulma, - name="adoption-notice-detail-bulma"), + path("vermittlung//", views.adoption_notice_detail_bulma, name="adoption-notice-detail"), # ex: /adoption_notice/7/edit path("vermittlung//edit", views.adoption_notice_edit, name="adoption-notice-edit"), # ex: /vermittlung/5/add-photo diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index e066b24..75f3270 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -173,7 +173,7 @@ def adoption_notice_edit(request, adoption_notice_id): """Log""" Log.objects.create(user=request.user, action="adoption_notice_edit", text=f"{request.user} hat Vermittlung {adoption_notice.pk} geändert") - return redirect(reverse("adoption-notice-detail-bulma", args=[adoption_notice_instance.pk], )) + return redirect(reverse("adoption-notice-detail", args=[adoption_notice_instance.pk], )) else: form = AdoptionNoticeForm(instance=adoption_notice) return render(request, 'fellchensammlung/forms/form-animal.html', context={"form": form}) @@ -282,7 +282,7 @@ def add_adoption_notice_bulma(request): # Automatically subscribe user that created AN to AN Subscriptions.objects.create(owner=request.user, adoption_notice=an_instance) - return redirect(reverse("adoption-notice-detail-bulma", args=[an_instance.pk])) + return redirect(reverse("adoption-notice-detail", args=[an_instance.pk])) else: print(form.errors) else: @@ -338,7 +338,7 @@ def add_photo_to_animal_bulma(request, animal_id): form = ImageForm(in_flow=True) return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form}) else: - return redirect(reverse("adoption-notice-detail-bulma", args=[animal.adoption_notice.pk], )) + return redirect(reverse("adoption-notice-detail", args=[animal.adoption_notice.pk], )) else: return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form}) @@ -393,8 +393,7 @@ def animal_edit(request, animal_id): """Log""" Log.objects.create(user=request.user, action="add_photo_to_animal", text=f"{request.user} hat Tier {animal.pk} zum Tier geändert") - print(reverse("adoption-notice-detail", args=[animal.adoption_notice.pk], )) - return redirect(reverse("adoption-notice-detail-bulma", args=[animal.adoption_notice.pk], )) + return redirect(reverse("adoption-notice-detail", args=[animal.adoption_notice.pk], )) else: form = AnimalForm(instance=animal) return render(request, 'fellchensammlung/forms/form-animal.html', context={"form": form})