X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a0d8de9db45ebc5f3c13779df19ffac842b9d96b..8b123b1f0d204c972d5a2554f9b27e4f7d8ae33f:/forum/models/action.py

diff --git a/forum/models/action.py b/forum/models/action.py
index d6d0c64..e8d0765 100644
--- 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)
 
-    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
@@ -36,9 +41,10 @@ class ActionManager(CachedManager):
 
 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")
-    action_type = models.CharField(max_length=16)
+    action_type = models.CharField(max_length=32)
     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_ip = models.CharField(max_length=16)
+    canceled_ip = models.CharField(max_length=39)
 
     hooks = {}
 
@@ -95,6 +101,7 @@ class Action(BaseModel):
             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)
 
@@ -231,6 +238,9 @@ class ActionProxy(Action):
         '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
 
@@ -290,7 +300,7 @@ class ActionRepute(models.Model):
         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