Merge cacheimp -> master

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index ce0d8de630e9fb067d9eef7761c3d7a795c4281d..5b6bef381474debedceab58b05575c29223b1563 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,43 +1,15 @@
 import datetime
 from base import *
 
-from forum.modules import MODULES_PACKAGE
-
 from django.utils.translation import ugettext as _
-import django.dispatch
-
-class ActiveTagManager(models.Manager):
-    def get_query_set(self):
-        qs = super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
-
-        CurrentUserHolder = None
-
-        # We try to import the moderation module and if the import is successful we make the filtration
-        try:
-            moderation_import = 'from %s.moderation.startup import CurrentUserHolder' % MODULES_PACKAGE
-            exec moderation_import
-
-            moderation_enabled= True
-        except:
-            moderation_enabled = False
-
-        # If the moderation module has been enabled we make the filtration
-        if CurrentUserHolder is not None and moderation_enabled:
-            user = CurrentUserHolder.user
 
-            try:
-                filter_content = not user.is_staff and not user.is_superuser
-            except:
-                filter_content = True
+from forum import modules
 
-            if filter_content:
-                moderation_import = 'from %s.moderation.hooks import get_tag_ids' % MODULES_PACKAGE
-                exec moderation_import
-                qs = qs.exclude(id__in=get_tag_ids('deleted')).exclude(id__in=get_tag_ids('rejected')).exclude(
-                    id__in=get_tag_ids('in_moderation')
-                )
+class ActiveTagManager(CachedManager):
+    use_for_related_fields = True
 
-        return qs
+    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)
@@ -48,14 +20,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 self.name
 
     def add_to_usage_count(self, value):
         if self.used_count + value < 0:
@@ -63,6 +34,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})