IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests Actions Projects Releases 47 Wiki Activity

#86 Log detail enhancements

Browse Source 
* restructures removing of related data into separate sub-delete forms for easier logic handling
This commit is contained in:
mpeltriaux
2022-02-08 13:16:20 +01:00
parent 43bc3517ff
commit 5ebb3f833a
21 changed files with 206 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intervention/views.py
View File

@@ -6,7 +6,8 @@ from django.shortcuts import render
from intervention.forms.forms import NewInterventionForm, EditInterventionForm
from intervention.forms.modalForms import ShareModalForm, NewRevocationModalForm, \
CheckModalForm, NewDeductionModalForm, NewInterventionDocumentForm
CheckModalForm, NewDeductionModalForm, NewInterventionDocumentForm, DeductionRemoveModalForm, \
RevocationRemoveModalForm
from intervention.models import Intervention, Revocation, InterventionDocument, RevocationDocument
from intervention.tables import InterventionTable
from konova.contexts import BaseContext
@@ -340,7 +341,7 @@ def remove_view(request: HttpRequest, id: str):
@login_required
@default_group_required
def remove_revocation_view(request: HttpRequest, id: str):
def remove_revocation_view(request: HttpRequest, id: str, revocation_id: str):
""" Renders a remove view for a revocation
Args:
@@ -350,13 +351,14 @@ def remove_revocation_view(request: HttpRequest, id: str):
Returns:
"""
obj = Revocation.objects.get(id=id)
intervention = get_object_or_404(Intervention, id=id)
revocation = get_object_or_404(Revocation, id=revocation_id)
form = RemoveModalForm(request.POST or None, instance=obj, request=request)
form = RevocationRemoveModalForm(request.POST or None, instance=intervention, revocation=revocation, request=request)
return form.process_request(
request,
REVOCATION_REMOVED,
redirect_url=reverse("intervention:detail", args=(obj.intervention.id,)) + "#related_data"
redirect_url=reverse("intervention:detail", args=(intervention.id,)) + "#related_data"
)
@@ -533,7 +535,7 @@ def remove_deduction_view(request: HttpRequest, id: str, deduction_id: str):
except ObjectDoesNotExist:
raise Http404("Unknown deduction")
form = RemoveModalForm(request.POST or None, instance=eco_deduction, request=request)
form = DeductionRemoveModalForm(request.POST or None, instance=intervention, deduction=eco_deduction, request=request)
return form.process_request(
request=request,
msg_success=DEDUCTION_REMOVED,