#OSQA-610, the used_count of the firstly added tags is now updated properly. The...

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

diff --git a/forum/models/tag.py b/forum/models/tag.py
index 0bff00473d1268e698e191745938d49e4dabfac2..5cbaf8a155a3288943f03ad4176ba8a0fe33f01e 100644 (file)
--- a/forum/models/tag.py
+++ b/forum/models/tag.py
@@ -1,16 +1,45 @@
+import datetime
 from base import *
 
 from django.utils.translation import ugettext as _
-import django.dispatch
 
 class ActiveTagManager(models.Manager):
     def get_query_set(self):
-        return super(ActiveTagManager, self).get_query_set().exclude(used_count__lt=1)
+        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
+
+            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')
+                )
+
+        return qs
 
 class Tag(BaseModel):
     name            = models.CharField(max_length=255, unique=True)
     created_by      = models.ForeignKey(User, related_name='created_tags')
+    created_at      = models.DateTimeField(default=datetime.datetime.now, blank=True, null=True)
     marked_by       = models.ManyToManyField(User, related_name="marked_tags", through="MarkedTag")
     # Denormalised data
     used_count = models.PositiveIntegerField(default=0)
@@ -22,7 +51,7 @@ class Tag(BaseModel):
         app_label = 'forum'
 
     def __unicode__(self):
-        return self.name
+        return u'%s' % self.name
 
     def add_to_usage_count(self, value):
         if self.used_count + value < 0: