summaryrefslogtreecommitdiff
path: root/archaeological_operations/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-01 12:41:44 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-08-13 18:26:03 +0200
commit2217e20855027c8233f98f6249dfb843f7dfb54c (patch)
tree34a471d9e263947fdfc6e6f1c2287f2fd3cb411a /archaeological_operations/models.py
parentde2020b06facad52aae63140d0b6155aa5b72d0a (diff)
downloadIshtar-2217e20855027c8233f98f6249dfb843f7dfb54c.tar.bz2
Ishtar-2217e20855027c8233f98f6249dfb843f7dfb54c.zip
Fix innapropriate parcel deletion
Diffstat (limited to 'archaeological_operations/models.py')
-rw-r--r--archaeological_operations/models.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 1c3bbde99..1a534af7a 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1395,6 +1395,8 @@ def strip_zero(value):
class Parcel(LightHistorizedItem):
EXTERNAL_ID_KEY = 'parcel_external_id'
+ BASE_SEARCH_VECTORS = ['section', 'parcel_number']
+ PARENT_SEARCH_VECTORS = ['operation']
associated_file = models.ForeignKey(
'archaeological_files.File',
@@ -1569,21 +1571,27 @@ def parcel_post_save(sender, **kwargs):
if not kwargs['instance']:
return
parcel = kwargs['instance']
- created = kwargs.get('created', None)
cached_label_changed(sender, **kwargs)
updated = False
+
+ """
# remove when the parcel is linked to nothing
+ # problematic in wizards
+ # TODO: add admin action
if not getattr(parcel, '_updated_id', None) and not created \
and not parcel.operation and not parcel.associated_file:
if parcel.context_record.count():
# trying to restore a lost parcel
parcel.operation = parcel.context_record.all()[0].operation
updated = True
- else:
+ elif parcel.id:
parcel.delete()
return
+ else:
+ return
+ """
if updated:
parcel.save()