diff options
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/migrations/0101_squashed.py | 6 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/tests.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_finds/migrations/0101_squashed.py b/archaeological_finds/migrations/0101_squashed.py index 7a7daab0c..4cae8d0d5 100644 --- a/archaeological_finds/migrations/0101_squashed.py +++ b/archaeological_finds/migrations/0101_squashed.py @@ -101,8 +101,7 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Base finds', 'permissions': (('view_own_basefind', 'Can view own Base find'), ('add_own_basefind', 'Can add own Base find'), ('change_own_basefind', 'Can change own Base find'), ('delete_own_basefind', 'Can delete own Base find')), }, - bases=(ishtar_common.models.BulkUpdatedItem, - ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter), + bases=(ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.OwnPerms, ishtar_common.models.ValueGetter), ), migrations.CreateModel( name='BatchType', @@ -234,8 +233,7 @@ class Migration(migrations.Migration): 'ordering': ('cached_label',), 'permissions': (('view_own_find', 'Can view own Find'), ('add_own_find', 'Can add own Find'), ('change_own_find', 'Can change own Find'), ('delete_own_find', 'Can delete own Find')), }, - bases=(ishtar_common.models.BulkUpdatedItem, - ishtar_common.models.ValueGetter, ishtar_common.models.DocumentItem, ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.ImageContainerModel, ishtar_common.models.OwnPerms, ishtar_common.models.MainItem), + bases=(ishtar_common.models.ValueGetter, ishtar_common.models.DocumentItem, ishtar_common.models.StatisticItem, ishtar_common.models.TemplateItem, models.Model, ishtar_common.models.CachedGen, ishtar_common.models_common.FixAssociated, ishtar_common.models.ImageContainerModel, ishtar_common.models.OwnPerms, ishtar_common.models.MainItem), ), migrations.CreateModel( name='FindBasket', diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 53a1e3eef..7da45166e 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -47,7 +47,6 @@ from ishtar_common.models import ( BaseHistorizedItem, Basket, BiographicalNote, - BulkUpdatedItem, CompleteIdentifierItem, Document, DocumentItem, @@ -531,7 +530,6 @@ class BFBulkView(object): class BaseFind( - BulkUpdatedItem, BaseHistorizedItem, GeographicSubTownItem, CompleteIdentifierItem, @@ -879,6 +877,11 @@ class BaseFind( def post_save_basefind(sender, **kwargs): cached_label_changed(sender, **kwargs) post_save_geo(sender, **kwargs) + instance = kwargs.get("instance", None) + if not instance or not instance.pk: + return + for f in instance.find.all(): + cached_label_changed(Find, instance=f) def pre_delete_basefind(sender, **kwargs): @@ -1078,7 +1081,6 @@ def query_loan(is_true=True): class Find( - BulkUpdatedItem, ValueGetter, DocumentItem, BaseHistorizedItem, diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py index 5a7e53849..e7b520fb6 100644 --- a/archaeological_finds/tests.py +++ b/archaeological_finds/tests.py @@ -1148,7 +1148,7 @@ class FindTest(FindInit, TestCase): cr.operation.save() base_find = models.BaseFind.objects.get(pk=base_find.pk) find = models.Find.objects.get(pk=find.pk) - cr = ContextRecord.objects.get(pk=cr.pk) + ContextRecord.objects.get(pk=cr.pk) self.assertIn("PAT", find.external_id) self.assertIn("PAT", base_find.external_id) |