Reintegrate merge cacheimp -> trunk.

[osqa.git] / forum / models / tag.py

diff --git a/forum/models/tag.py b/forum/models/tag.py
index dd628c830d2580b7e5e403241dfa065deb556f37..c84a922d192a3ae330a815b60a4c7b7cc13f530a 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext as _
 
 from forum import modules
 
-class ActiveTagManager(models.Manager):
+class ActiveTagManager(CachedManager):
     use_for_related_fields = True
 
     def get_query_set(self):
@@ -34,6 +34,20 @@ class Tag(BaseModel):
         else:
             self.used_count = models.F('used_count') + value
 
+    def cache_key(self):
+        return self._generate_cache_key(self.name)
+
+    @classmethod
+    def infer_cache_key(cls, querydict):
+        if 'name' in querydict:
+            return cls._generate_cache_key(querydict['name'])
+
+        return BaseModel.infer_cache_key(querydict)
+
+    @classmethod
+    def value_to_list_on_cache_query(cls):
+        return 'name'
+
     @models.permalink
     def get_absolute_url(self):
         return ('tag_questions', (), {'tag': self.name})