From aba91db15281b87752ee4c355df402fd1ea9a5e5 Mon Sep 17 00:00:00 2001 From: mpeltriaux Date: Tue, 13 Dec 2022 09:15:22 +0100 Subject: [PATCH] #277 Deleted entries accessible * fixes bug where deleted entries could be accessed if detail page would be called directly --- compensation/views/compensation/compensation.py | 7 ++++++- compensation/views/eco_account/eco_account.py | 3 ++- intervention/views/intervention.py | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/compensation/views/compensation/compensation.py b/compensation/views/compensation/compensation.py index 1e3553a..d5d7715 100644 --- a/compensation/views/compensation/compensation.py +++ b/compensation/views/compensation/compensation.py @@ -203,7 +203,12 @@ def detail_view(request: HttpRequest, id: str): """ template = "compensation/detail/compensation/view.html" - comp = get_object_or_404(Compensation, id=id) + comp = get_object_or_404( + Compensation, + id=id, + deleted=None, + intervention__deleted=None, + ) geom_form = SimpleGeomForm(instance=comp) parcels = comp.get_underlying_parcels() _user = request.user diff --git a/compensation/views/eco_account/eco_account.py b/compensation/views/eco_account/eco_account.py index 077df14..99344cf 100644 --- a/compensation/views/eco_account/eco_account.py +++ b/compensation/views/eco_account/eco_account.py @@ -184,7 +184,8 @@ def detail_view(request: HttpRequest, id: str): 'geometry', 'responsible', ), - id=id + id=id, + deleted=None, ) geom_form = SimpleGeomForm(instance=acc) parcels = acc.get_underlying_parcels() diff --git a/intervention/views/intervention.py b/intervention/views/intervention.py index 329e7d5..0dd59bd 100644 --- a/intervention/views/intervention.py +++ b/intervention/views/intervention.py @@ -143,7 +143,8 @@ def detail_view(request: HttpRequest, id: str): "legal", "responsible", ), - id=id + id=id, + deleted=None ) compensations = intervention.compensations.filter( deleted=None,