refactor: Remove non-bulma add image for ANs
This commit is contained in:
@@ -33,10 +33,8 @@ urlpatterns = [
|
|||||||
# 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
|
||||||
path("vermittlung/<int:adoption_notice_id>/add-photo", views.add_photo_to_adoption_notice,
|
path("vermittlung/<int:adoption_notice_id>/add-photo", views.add_photo_to_adoption_notice_bulma,
|
||||||
name="adoption-notice-add-photo"),
|
name="adoption-notice-add-photo"),
|
||||||
path("bulma/vermittlung/<int:adoption_notice_id>/add-photo", views.add_photo_to_adoption_notice_bulma,
|
|
||||||
name="adoption-notice-add-photo-bulma"),
|
|
||||||
# ex: /adoption_notice/2/add-animal
|
# ex: /adoption_notice/2/add-animal
|
||||||
path("vermittlung/<int:adoption_notice_id>/add-animal", views.adoption_notice_add_animal,
|
path("vermittlung/<int:adoption_notice_id>/add-animal", views.adoption_notice_add_animal,
|
||||||
name="adoption-notice-add-animal"),
|
name="adoption-notice-add-animal"),
|
||||||
|
@@ -347,34 +347,6 @@ def add_photo_to_animal_bulma(request, animal_id):
|
|||||||
return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
|
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
|
@login_required
|
||||||
def add_photo_to_adoption_notice_bulma(request, adoption_notice_id):
|
def add_photo_to_adoption_notice_bulma(request, adoption_notice_id):
|
||||||
adoption_notice = AdoptionNotice.objects.get(id=adoption_notice_id)
|
adoption_notice = AdoptionNotice.objects.get(id=adoption_notice_id)
|
||||||
|
Reference in New Issue
Block a user