diff --git a/src/fellchensammlung/urls.py b/src/fellchensammlung/urls.py index 17c8121..c3c2301 100644 --- a/src/fellchensammlung/urls.py +++ b/src/fellchensammlung/urls.py @@ -33,10 +33,8 @@ urlpatterns = [ # ex: /adoption_notice/7/edit path("vermittlung//edit", views.adoption_notice_edit, name="adoption-notice-edit"), # ex: /vermittlung/5/add-photo - path("vermittlung//add-photo", views.add_photo_to_adoption_notice, + path("vermittlung//add-photo", views.add_photo_to_adoption_notice_bulma, name="adoption-notice-add-photo"), - path("bulma/vermittlung//add-photo", views.add_photo_to_adoption_notice_bulma, - name="adoption-notice-add-photo-bulma"), # ex: /adoption_notice/2/add-animal path("vermittlung//add-animal", views.adoption_notice_add_animal, name="adoption-notice-add-animal"), diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py index 7e8ffa3..bc9532d 100644 --- a/src/fellchensammlung/views.py +++ b/src/fellchensammlung/views.py @@ -347,34 +347,6 @@ def add_photo_to_animal_bulma(request, animal_id): return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form}) -@login_required -def add_photo_to_adoption_notice(request, adoption_notice_id): - adoption_notice = AdoptionNotice.objects.get(id=adoption_notice_id) - # Only users that are mods or owners of the adoption notice are allowed to add to it - fail_if_user_not_owner_or_trust_level(request.user, adoption_notice) - 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() - adoption_notice.photos.add(instance) - """Log""" - Log.objects.create(user=request.user, action="add_photo_to_animal", - text=f"{request.user} hat Foto {instance.pk} zur Vermittlung {adoption_notice.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=[adoption_notice_id])) - else: - return render(request, 'fellchensammlung/forms/form-image.html', {'form': form}) - else: - form = ImageForm(in_flow=True) - return render(request, 'fellchensammlung/forms/form-image.html', {'form': form}) - - @login_required def add_photo_to_adoption_notice_bulma(request, adoption_notice_id): adoption_notice = AdoptionNotice.objects.get(id=adoption_notice_id)