X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/6f16f6850fbdd4acb2a4f985b3a9dab0a3129e49..9b7822cca75d3fdd36f5a4cfa858272214621578:/forum/models/tag.py

diff --git a/forum/models/tag.py b/forum/models/tag.py
index d189a1c..067488b 100644
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,12 +1,14 @@
 import datetime
 from base import *
 
-from forum.modules import MODULES_PACKAGE
-
 from django.utils.translation import ugettext as _
-import django.dispatch
+from django.utils.encoding import smart_unicode, force_unicode
+
+from forum import modules
+
+class ActiveTagManager(CachedManager):
+    use_for_related_fields = True
 
-class ActiveTagManager(models.Manager):
     def get_query_set(self):
         return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
 
@@ -19,14 +21,13 @@ class Tag(BaseModel):
     used_count = models.PositiveIntegerField(default=0)
 
     active = ActiveTagManager()
-    objects = ActiveTagManager()
 
     class Meta:
         ordering = ('-used_count', 'name')
         app_label = 'forum'
 
     def __unicode__(self):
-        return u'%s' % self.name
+        return force_unicode(self.name)
 
     def add_to_usage_count(self, value):
         if self.used_count + value < 0:
@@ -34,6 +35,24 @@ class Tag(BaseModel):
         else:
             self.used_count = models.F('used_count') + value
 
+    def cache_key(self):
+        return self._generate_cache_key(Tag.safe_cache_name(self.name))
+
+    @classmethod
+    def safe_cache_name(cls, name):
+        return "".join([str(ord(c)) for c in name])
+
+    @classmethod
+    def infer_cache_key(cls, querydict):
+        if 'name' in querydict:
+            return cls._generate_cache_key(cls.safe_cache_name(querydict['name']))
+
+        return None
+
+    @classmethod
+    def value_to_list_on_cache_query(cls):
+        return 'name'
+
     @models.permalink
     def get_absolute_url(self):
         return ('tag_questions', (), {'tag': self.name})