Reverted last commit as it leads to test failures. Doubtful if these actually can occur in production, but tests will have to be re-written before using the added caching.

 - Legacy-Id: 12220

Author: levkowetz

ietf/meeting/models.py

@@ -1004,9 +1004,8 @@ def get_material(self, material_type, only_one):
             for d in l:
                 d.meeting_related = lambda: True
         else:
-            if not hasattr(self, '_cached_materials'):
-                self._cached_materials = self.materials.exclude(states__slug='deleted').order_by('sessionpresentation__order')
-            l = self._cached_materials.filter(type=material_type).exclude(states__type=material_type)
+            l = self.materials.filter(type=material_type).exclude(states__type=material_type, states__slug='deleted').order_by('sessionpresentation__order')
+
         if only_one:
             if l:
                 return l[0]
@@ -1021,29 +1020,21 @@ def agenda(self):
         return self._agenda_cache
 
     def minutes(self):
-        if not hasattr(self, "_minutes_cache"):
-            self._minutes_cache = self.get_material("minutes", only_one=True)
-        return self._minutes_cache
+        return self.get_material("minutes", only_one=True)
 
     def recordings(self):
-        if not hasattr(self, "_recordings_cache"):
-            self._recordings_cache = list(self.get_material("recording", only_one=False))
-        return self._recordings_cache
+        return list(self.get_material("recording", only_one=False))
 
     def bluesheets(self):
-        if not hasattr(self, "_bluesheets_cache"):
-            self._bluesheets_cache =  list(self.get_material("bluesheets", only_one=False))
-        return self._bluesheets_cache
+        return list(self.get_material("bluesheets", only_one=False))
 
     def slides(self):
         if not hasattr(self, "_slides_cache"):
             self._slides_cache = list(self.get_material("slides", only_one=False))
         return self._slides_cache
 
     def drafts(self):
-        if not hasattr(self, "_drafts_cache"):
-            self._drafts_cache = list(self.materials.filter(type='draft'))
-        return self._drafts_cache
+        return list(self.materials.filter(type='draft'))
 
     def all_meeting_sessions_for_group(self):
         #sessions = [s for s in self.meeting.session_set.filter(group=self.group,type=self.type) if s.official_timeslotassignment()]