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

Merge pull request 'master' (#279) from master into Docker

Browse Source 
Reviewed-on: SGD-Nord/konova#279
This commit is contained in:
mpeltriaux 2022-12-14 16:37:41 +01:00
commit 299727a7b4
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compensation/views/compensation/compensation.py
View File

@ -203,7 +203,12 @@ def detail_view(request: HttpRequest, id: str):
""" """
template = "compensation/detail/compensation/view.html" 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) geom_form = SimpleGeomForm(instance=comp)
parcels = comp.get_underlying_parcels() parcels = comp.get_underlying_parcels()
_user = request.user _user = request.user

3
compensation/views/eco_account/eco_account.py
View File

@ -184,7 +184,8 @@ def detail_view(request: HttpRequest, id: str):
'geometry', 'geometry',
'responsible', 'responsible',
), ),
id=id id=id,
deleted=None,
) )
geom_form = SimpleGeomForm(instance=acc) geom_form = SimpleGeomForm(instance=acc)
parcels = acc.get_underlying_parcels() parcels = acc.get_underlying_parcels()

3
intervention/views/intervention.py
View File

@ -143,7 +143,8 @@ def detail_view(request: HttpRequest, id: str):
"legal", "legal",
"responsible", "responsible",
), ),
id=id id=id,
deleted=None
) )
compensations = intervention.compensations.filter( compensations = intervention.compensations.filter(
deleted=None, deleted=None,

6
konova/models/document.py
View File

@ -87,7 +87,7 @@ class AbstractDocument(BaseResource):
""" """
try: try:
os.remove(self.file.file.name) os.remove(self.file.file.name)
except FileNotFoundError: except (FileNotFoundError, ValueError):
# File seems to missing anyway - continue! # File seems to missing anyway - continue!
pass pass
super().delete(using=using, keep_parents=keep_parents) super().delete(using=using, keep_parents=keep_parents)
@ -113,7 +113,7 @@ class AbstractDocument(BaseResource):
""" """
try: try:
os.remove(self.file.file.name) os.remove(self.file.file.name)
except FileNotFoundError: except (FileNotFoundError, ValueError):
pass pass
self.file = new_file self.file = new_file
self.save() self.save()