OSQA-748, smart unicode filtration for the username in the accept rate singular title

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

diff --git a/forum/models/action.py b/forum/models/action.py
index ca6b96e227203b8aa74d3fe4140e951a819a07de..e8d076542adbdce911816203d808ad85b9ff1137 100644 (file)
--- a/forum/models/action.py
+++ b/forum/models/action.py
@@ -15,8 +15,13 @@ class ActionQuerySet(CachedQuerySet):
         else:
             return super(ActionQuerySet, self).obj_from_datadict(datadict)
 
         else:
             return super(ActionQuerySet, self).obj_from_datadict(datadict)
 

-    def get(self, *args, **kwargs):
-        return super(ActionQuerySet, self).get(*args, **kwargs).leaf()
+    def get(self, *args, **kwargs):            
+        action = super(ActionQuerySet, self).get(*args, **kwargs).leaf
+
+        if not isinstance(action, self.model):
+            raise self.model.DoesNotExist()
+
+        return action

 
 class ActionManager(CachedManager):
     use_for_related_fields = True
 
 class ActionManager(CachedManager):
     use_for_related_fields = True


@@ -36,9 +41,10 @@ class ActionManager(CachedManager):
 
 class Action(BaseModel):
     user = models.ForeignKey('User', related_name="actions")
 
 class Action(BaseModel):
     user = models.ForeignKey('User', related_name="actions")

-    ip   = models.CharField(max_length=16)
+    real_user = models.ForeignKey('User', related_name="proxied_actions", null=True)
+    ip   = models.CharField(max_length=39)

     node = models.ForeignKey('Node', null=True, related_name="actions")
     node = models.ForeignKey('Node', null=True, related_name="actions")

-    action_type = models.CharField(max_length=16)
+    action_type = models.CharField(max_length=32)

     action_date = models.DateTimeField(default=datetime.datetime.now)
 
     extra = PickledObjectField()
     action_date = models.DateTimeField(default=datetime.datetime.now)
 
     extra = PickledObjectField()


@@ -46,7 +52,7 @@ class Action(BaseModel):
     canceled = models.BooleanField(default=False)
     canceled_by = models.ForeignKey('User', null=True, related_name="canceled_actions")
     canceled_at = models.DateTimeField(null=True)
     canceled = models.BooleanField(default=False)
     canceled_by = models.ForeignKey('User', null=True, related_name="canceled_actions")
     canceled_at = models.DateTimeField(null=True)

-    canceled_ip = models.CharField(max_length=16)
+    canceled_ip = models.CharField(max_length=39)

 
     hooks = {}
 
 
     hooks = {}
 


@@ -95,6 +101,7 @@ class Action(BaseModel):
             cancel = ActionRepute(action=self, user=repute.user, value=(-repute.value), by_canceled=True)
             cancel.save()
 
             cancel = ActionRepute(action=self, user=repute.user, value=(-repute.value), by_canceled=True)
             cancel.save()
 

+    @property

     def leaf(self):
         leaf_cls = ActionProxyMetaClass.types.get(self.action_type, None)
 
     def leaf(self):
         leaf_cls = ActionProxyMetaClass.types.get(self.action_type, None)
 


@@ -111,7 +118,7 @@ class Action(BaseModel):
     def get_type(cls):
         return re.sub(r'action$', '', cls.__name__.lower())
 
     def get_type(cls):
         return re.sub(r'action$', '', cls.__name__.lower())
 

-    def save(self, data=None, *args, **kwargs):
+    def save(self, data=None, threaded=True, *args, **kwargs):

         isnew = False
 
         if not self.id:
         isnew = False
 
         if not self.id:


@@ -127,7 +134,7 @@ class Action(BaseModel):
             if (self.node is None) or (not self.node.nis.wiki):
                 self.repute_users()
             self.process_action()
             if (self.node is None) or (not self.node.nis.wiki):
                 self.repute_users()
             self.process_action()

-            self.trigger_hooks(True)
+            self.trigger_hooks(threaded, True)

 
         return self
 
 
         return self
 


@@ -167,15 +174,18 @@ class Action(BaseModel):
 
         Action.hooks[cls].append(fn)
 
 
         Action.hooks[cls].append(fn)
 

-    def trigger_hooks(self, new=True):
-        thread = Thread(target=trigger_hooks_threaded, args=[self, Action.hooks, new])
-        thread.setDaemon(True)
-        thread.start()
+    def trigger_hooks(self, threaded, new=True):
+        if threaded:
+            thread = Thread(target=trigger_hooks, args=[self, Action.hooks, new])
+            thread.setDaemon(True)
+            thread.start()
+        else:
+            trigger_hooks(self, Action.hooks, new)

 
     class Meta:
         app_label = 'forum'
 
 
     class Meta:
         app_label = 'forum'
 

-def trigger_hooks_threaded(action, hooks, new):
+def trigger_hooks(action, hooks, new):

     for cls, hooklist in hooks.items():
         if isinstance(action, cls):
             for hook in hooklist:
     for cls, hooklist in hooks.items():
         if isinstance(action, cls):
             for hook in hooklist:


@@ -228,6 +238,9 @@ class ActionProxy(Action):
         'node_desc': node_desc,
         }
 
         'node_desc': node_desc,
         }
 

+    def affected_links(self, viewer):
+        return ", ".join([self.hyperlink(u.get_profile_url(), self.friendly_username(viewer, u)) for u in set([r.user for r in self.reputes.all()])])
+

     class Meta:
         proxy = True
 
     class Meta:
         proxy = True
 


@@ -287,7 +300,7 @@ class ActionRepute(models.Model):
         return 0
 
     def _add_to_rep(self, value):
         return 0
 
     def _add_to_rep(self, value):

-        if self.user.reputation + value < 0:
+        if (self.user.reputation + value < 1) and not settings.ALLOW_NEGATIVE_REPUTATION:

             return 0
         else:
             return models.F('reputation') + value
             return 0
         else:
             return models.F('reputation') + value