From cbf94ad4f1bc22d4eb02714e61bdafb4281120e4 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Sat, 14 Feb 2015 11:13:13 +0100
Subject: [PATCH] Move some optimizations and checks around

---
 src/pretixbase/models.py         | 19 ++++++++++++++++---
 src/pretixpresale/views/event.py |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pretixbase/models.py b/src/pretixbase/models.py
index 99481bab30..8fe8932d25 100644
--- a/src/pretixbase/models.py
+++ b/src/pretixbase/models.py
@@ -745,14 +745,27 @@ class Item(Versionable):
             return self._get_all_available_variations_cache
 
         from .signals import determine_availability
-        if self.properties.count() == 0:
+
+        propids = set([p.identity for p in self.properties.all()])
+        if len(propids) == 0:
             variations = [VariationDict()]
         else:
-            all_variations = list(self.variations.annotate(qc=Count('quotas')).filter(qc__gt=0))
+            all_variations = list(
+                self.variations.annotate(
+                    qc=Count('quotas')
+                ).filter(qc__gt=0).prefetch_related(
+                    "values", "values__prop"
+                )
+            )
             variations = []
             for var in all_variations:
+                values = list(var.values.all())
+                # Make sure we don't expose stale ItemVariation objects which are
+                # still around altough they have an old set of properties
+                if set([v.prop.identity for v in values]) != propids:
+                    continue
                 vardict = VariationDict()
-                for v in var.values.all():
+                for v in values:
                     vardict[v.prop.identity] = v
                 vardict['variation'] = var
                 variations.append(vardict)
diff --git a/src/pretixpresale/views/event.py b/src/pretixpresale/views/event.py
index 2c6a932845..7aeac158ed 100644
--- a/src/pretixpresale/views/event.py
+++ b/src/pretixpresale/views/event.py
@@ -18,7 +18,7 @@ class EventIndex(EventViewMixin, TemplateView):
         items = self.request.event.items.all().select_related(
             'category',  # for re-grouping
         ).prefetch_related(
-            'properties', 'variations__values__prop',  # for .get_all_available_variations()
+            'properties',  # for .get_all_available_variations()
             'quotas', 'variations__quotas'  # for .availability()
         ).annotate(quotac=Count('quotas')).filter(
             quotac__gt=0