Merge branch 'master' into v0.9

1 files changed, 5 insertions, 4 deletions

diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py
index f527bf5d3..adfa67394 100644
--- a/archaeological_finds/models.py
+++ b/archaeological_finds/models.py
@@ -549,9 +549,9 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
         super(Find, self).save(*args, **kwargs)
         q = self.base_finds
         if not self.index and q.count():
-            operation = q.order_by(
-                '-context_record__operation__start_date')\
-                .all()
+            operation = q.filter(
+                context_record__operation__pk__isnull=False).order_by(
+                '-context_record__operation__start_date')
             if operation.count():
                 operation = operation.all()[0].context_record.operation
                 q = Find.objects\
@@ -563,7 +563,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
                 else:
                     self.index = 1
                 self.save()
-        for base_find in self.base_finds.all():
+        for base_find in self.base_finds.filter(
+                context_record__operation__pk__isnull=False).all():
             modified = False
             if not base_find.index:
                 modified = True