From 01aa8baaddffc51d60444bfc06a039089c0ed313 Mon Sep 17 00:00:00 2001 From: moanos Date: Tue, 17 Jun 2025 06:55:57 +0200 Subject: [PATCH] refactor: Remove non-bulma add image --- .../forms/bulma-form-image.html | 2 +- .../fellchensammlung/forms/form-image.html | 17 ----------- .../partials/bulma-partial-animal-card.html | 2 +- src/fellchensammlung/urls.py | 3 +- src/fellchensammlung/views.py | 28 ------------------- 5 files changed, 3 insertions(+), 49 deletions(-) delete mode 100644 src/fellchensammlung/templates/fellchensammlung/forms/form-image.html diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-image.html b/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-image.html index cb2c28e..9655651 100644 --- a/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-image.html +++ b/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-image.html @@ -9,7 +9,7 @@ Lade hier ein Foto hoch - wähle den Titel wie du willst und mach bitte eine Bildbeschreibung, damit die Fotos auch für blinde und sehbehinderte Personen zugänglich sind. {% endblocktranslate %} -

{% translate 'Anleitung für Bildbeschreibungen' %}

diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/form-image.html b/src/fellchensammlung/templates/fellchensammlung/forms/form-image.html deleted file mode 100644 index a245507..0000000 --- a/src/fellchensammlung/templates/fellchensammlung/forms/form-image.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "fellchensammlung/base_generic.html" %} - -{% load i18n %} -{% load crispy_forms_tags %} - -{% block content %} -

- {% blocktranslate %} - Lade hier ein Foto hoch - wähle den Titel wie du willst und mach bitte eine Bildbeschreibung, - damit die Fotos auch für blinde und sehbehinderte Personen zugänglich sind. - {% endblocktranslate %} -

{% translate 'Anleitung für Bildbeschreibungen' %}

-

-
- {% crispy form %} -
-{% endblock %} \ No newline at end of file diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-animal-card.html b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-animal-card.html index 95b023b..ca33577 100644 --- a/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-animal-card.html +++ b/src/fellchensammlung/templates/fellchensammlung/partials/bulma-partial-animal-card.html @@ -60,7 +60,7 @@ {% translate 'Bearbeiten' %} {% translate 'Foto hinzufügen' %} + href="{% url 'animal-add-photo' animal_id=animal.pk %}">{% translate 'Foto hinzufügen' %} {% endif %} diff --git a/src/fellchensammlung/urls.py b/src/fellchensammlung/urls.py index 44afe8b..17c8121 100644 --- a/src/fellchensammlung/urls.py +++ b/src/fellchensammlung/urls.py @@ -25,8 +25,7 @@ urlpatterns = [ # ex: /animal/5/edit path("tier//edit", views.animal_edit, name="animal-edit"), # ex: /animal/5/add-photo - path("tier//add-photo", views.add_photo_to_animal, name="animal-add-photo"), - path("bulma/tier//add-photo", views.add_photo_to_animal_bulma, name="animal-add-photo-bulma"), + 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, diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index d0285f5..7e8ffa3 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -314,34 +314,6 @@ def adoption_notice_add_animal(request, adoption_notice_id): return render(request, 'fellchensammlung/forms/form_add_animal_to_adoption.html', {'form': form}) -@login_required -def add_photo_to_animal(request, animal_id): - animal = Animal.objects.get(id=animal_id) - # Only users that are mods or owners of the animal are allowed to add to it - fail_if_user_not_owner_or_trust_level(request.user, animal) - if request.method == 'POST': - form = ImageForm(request.POST, request.FILES) - - if form.is_valid(): - instance = form.save(commit=False) - instance.owner = request.user - instance.save() - - animal.photos.add(instance) - - """Log""" - Log.objects.create(user=request.user, action="add_photo_to_animal", - text=f"{request.user} hat Foto {instance.pk} zum Tier {animal.pk} hinzugefügt") - - if "save-and-add-another" in request.POST: - form = ImageForm(in_flow=True) - return render(request, 'fellchensammlung/forms/form-image.html', {'form': form}) - else: - return redirect(reverse("adoption-notice-detail", args=[animal.adoption_notice.pk], )) - else: - form = ImageForm(in_flow=True) - return render(request, 'fellchensammlung/forms/form-image.html', {'form': form}) - @login_required def add_photo_to_animal_bulma(request, animal_id):