OSQA-436, now we support hyphens in the usernames too. Changing the username regex...

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 44e0a749aa40f0bdbd6fe274c59f374dc55c774f..067488b2f97ca6bc77c6a6f9cca25c281ceb6070 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -2,13 +2,16 @@ import datetime
 from base import *
 
 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)
 
-
 class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
     created_by      = models.ForeignKey(User, related_name='created_tags')
@@ -24,7 +27,7 @@ class Tag(BaseModel):
         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:
@@ -32,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})