moanos/Notfellchen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Remove non-bulma adoption detail

Browse Source
This commit is contained in:
moanos [he/him]
2025-06-17 07:13:03 +02:00
parent e010fa413b
commit 44c34d2daa
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fellchensammlung/models.py
View File

@@ -388,10 +388,6 @@ class AdoptionNotice(models.Model):
"""Returns the url to access a detailed page for the adoption notice.""" """Returns the url to access a detailed page for the adoption notice."""
return reverse('adoption-notice-detail', args=[str(self.id)]) 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): def get_report_url(self):
"""Returns the url to report an adoption notice.""" """Returns the url to report an adoption notice."""
return reverse('report-adoption-notice', args=[str(self.id)]) return reverse('report-adoption-notice', args=[str(self.id)])

2
src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal-map.html
View File

@@ -3,7 +3,7 @@
<h2 class="heading-card-adoption-notice title is-4"> <h2 class="heading-card-adoption-notice title is-4">
<a href="{{ adoption_notice.get_absolute_url_bulma }}"> {{ adoption_notice.name }}</a> <a href="{{ adoption_notice.get_absolute_url }}"> {{ adoption_notice.name }}</a>
</h2> </h2>
<div class="grid mb-0"> <div class="grid mb-0">

2
src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-adoption-notice-minimal.html
View File

@@ -4,7 +4,7 @@
<div class="card an-card"> <div class="card an-card">
<div class="card-header"> <div class="card-header">
<h2 class="card-header-title"> <h2 class="card-header-title">
<a href="{{ adoption_notice.get_absolute_url_bulma }}"> {{ adoption_notice.name }}</a> <a href="{{ adoption_notice.get_absolute_url }}"> {{ adoption_notice.name }}</a>
</h2> </h2>
</div> </div>
<div class="card-content"> <div class="card-content">

4
src/fellchensammlung/urls.py
View File

@@ -27,9 +27,7 @@ urlpatterns = [
# ex: /animal/5/add-photo # ex: /animal/5/add-photo
path("tier/<int:animal_id>/add-photo", views.add_photo_to_animal_bulma, name="animal-add-photo"), path("tier/<int:animal_id>/add-photo", views.add_photo_to_animal_bulma, name="animal-add-photo"),
# ex: /adoption_notice/7/ # ex: /adoption_notice/7/
path("vermittlung/<int:adoption_notice_id>/", views.adoption_notice_detail, name="adoption-notice-detail"), path("vermittlung/<int:adoption_notice_id>/", views.adoption_notice_detail_bulma, name="adoption-notice-detail"),
path("bulma/vermittlung/<int:adoption_notice_id>/", views.adoption_notice_detail_bulma,
name="adoption-notice-detail-bulma"),
# ex: /adoption_notice/7/edit # ex: /adoption_notice/7/edit
path("vermittlung/<int:adoption_notice_id>/edit", views.adoption_notice_edit, name="adoption-notice-edit"), path("vermittlung/<int:adoption_notice_id>/edit", views.adoption_notice_edit, name="adoption-notice-edit"),
# ex: /vermittlung/5/add-photo # ex: /vermittlung/5/add-photo

9
src/fellchensammlung/views.py
View File

@@ -173,7 +173,7 @@ def adoption_notice_edit(request, adoption_notice_id):
"""Log""" """Log"""
Log.objects.create(user=request.user, action="adoption_notice_edit", Log.objects.create(user=request.user, action="adoption_notice_edit",
text=f"{request.user} hat Vermittlung {adoption_notice.pk} geändert") 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: else:
form = AdoptionNoticeForm(instance=adoption_notice) form = AdoptionNoticeForm(instance=adoption_notice)
return render(request, 'fellchensammlung/forms/form-animal.html', context={"form": form}) 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 # Automatically subscribe user that created AN to AN
Subscriptions.objects.create(owner=request.user, adoption_notice=an_instance) 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: else:
print(form.errors) print(form.errors)
else: else:
@@ -338,7 +338,7 @@ def add_photo_to_animal_bulma(request, animal_id):
form = ImageForm(in_flow=True) form = ImageForm(in_flow=True)
return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form}) return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
else: 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: else:
return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form}) return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
@@ -393,8 +393,7 @@ def animal_edit(request, animal_id):
"""Log""" """Log"""
Log.objects.create(user=request.user, action="add_photo_to_animal", Log.objects.create(user=request.user, action="add_photo_to_animal",
text=f"{request.user} hat Tier {animal.pk} zum Tier geändert") 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", args=[animal.adoption_notice.pk], ))
return redirect(reverse("adoption-notice-detail-bulma", args=[animal.adoption_notice.pk], ))
else: else:
form = AnimalForm(instance=animal) form = AnimalForm(instance=animal)
return render(request, 'fellchensammlung/forms/form-animal.html', context={"form": form}) return render(request, 'fellchensammlung/forms/form-animal.html', context={"form": form})