diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 05:09:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-06-18 05:09:18 +0200 |
| commit | c5b29311c88eb1251cd1a30c63ec8ad6ea64df7d (patch) | |
| tree | b319e3f9cee6ae766f011eeb564a110828ec4627 | |
| parent | 3e0ade895bc1100181d51440227e3b4201f58a74 (diff) | |
| parent | 5c20be2beccbc9cb6731d32ecdc670b9aef20499 (diff) | |
| download | Ishtar-c5b29311c88eb1251cd1a30c63ec8ad6ea64df7d.tar.bz2 Ishtar-c5b29311c88eb1251cd1a30c63ec8ad6ea64df7d.zip | |
Merge branch 'stable'
| -rw-r--r-- | archaeological_operations/tests.py | 4 | ||||
| -rw-r--r-- | ishtar_common/models.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py index bbe92b3c8..9abc62bd4 100644 --- a/archaeological_operations/tests.py +++ b/archaeological_operations/tests.py @@ -170,6 +170,10 @@ class ImportOperationTest(TestCase): self.assertEqual(models.Parcel.objects.get(parcel_number='55', section='YY').external_id, 'YY55') + # delete associated parcel with the import deletion + parcel_count = models.Parcel.objects.count() + impt.delete() + self.assertEqual(parcel_count-2, models.Parcel.objects.count()) def testParseParcels(self): diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 5dfac246e..aa055adab 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1503,9 +1503,6 @@ def pre_delete_import(sender, **kwargs): return to_delete = [] for accessor, imported in instance.get_all_imported(): - # if imported is related to another import do not delete - if getattr(instance, accessor).exclude(pk=imported.pk).count(): - continue to_delete.append(imported) for item in to_delete: item.delete() |