X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/d0a422f6749091582d3f4b94e7fda9869b9ed4e4..b25ea1aa5c57245fbc66dbb802fb228f0f724870:/forum/models/node.py?ds=sidebyside

diff --git a/forum/models/node.py b/forum/models/node.py
index 6d8a483..6a18165 100644
--- a/forum/models/node.py
+++ b/forum/models/node.py
@@ -21,7 +21,7 @@ class NodeContent(models.Model):
 
     @property
     def html(self):
-        return self.as_markdown()
+        return self.body
 
     @classmethod
     def _as_markdown(cls, content, *extensions):
@@ -78,13 +78,10 @@ class NodeMetaClass(BaseMetaClass):
             return node_cls.objects.filter(parent=self)
 
         def parent(self):
-            p = self.__dict__.get('_%s_cache' % name, None)
+            if (self.parent is not None) and self.parent.node_type == name:
+                return self.parent.leaf
 
-            if p is None and (self.parent is not None) and self.parent.node_type == name:
-                p = self.parent.leaf
-                self.__dict__['_%s_cache' % name] = p
-
-            return p
+            return None
 
         Node.add_to_class(name + 's', property(children))
         Node.add_to_class(name, property(parent))
@@ -108,6 +105,30 @@ class NodeQuerySet(CachedQuerySet):
 
         return node
 
+    def any_state(self, *args):
+        filter = None
+
+        for s in args:
+            s_filter = models.Q(state_string__contains="(%s)" % s)
+            filter = filter and (filter | s_filter) or s_filter
+
+        if filter:
+            return self.filter(filter)
+        else:
+            return self
+
+    def all_states(self, *args):
+        filter = None
+
+        for s in args:
+            s_filter = models.Q(state_string__contains="(%s)" % s)
+            filter = filter and (filter & s_filter) or s_filter
+
+        if filter:
+            return self.filter(filter)
+        else:
+            return self
+
     def filter_state(self, **kwargs):
         apply_bool = lambda q, b: b and q or ~q
         return self.filter(*[apply_bool(models.Q(state_string__contains="(%s)" % s), b) for s, b in kwargs.items()])
@@ -223,7 +244,7 @@ class Node(BaseModel, NodeContent):
     @classmethod
     def _generate_cache_key(cls, key, group="node"):
         return super(Node, cls)._generate_cache_key(key, group)
-
+        
     @classmethod
     def get_type(cls):
         return cls.__name__.lower()
@@ -259,6 +280,17 @@ class Node(BaseModel, NodeContent):
 
         return nis
 
+    @property
+    def last_activity(self):
+        try:
+            return self.actions.order_by('-action_date')[0].action_date
+        except:
+            return self.last_seen
+
+    @property
+    def state_list(self):
+        return [s.state_type for s in self.states.all()]
+
     @property
     def deleted(self):
         return self.nis.deleted
@@ -278,12 +310,15 @@ class Node(BaseModel, NodeContent):
     def get_revisions_url(self):
         return ('revisions', (), {'id': self.id})
 
-    def update_last_activity(self, user, save=False):
+    def update_last_activity(self, user, save=False, time=None):
+        if not time:
+            time = datetime.datetime.now()
+
         self.last_activity_by = user
-        self.last_activity_at = datetime.datetime.now()
+        self.last_activity_at = time
 
         if self.parent:
-            self.parent.update_last_activity(user, save=True)
+            self.parent.update_last_activity(user, save=True, time=time)
 
         if save:
             self.save()
@@ -299,10 +334,10 @@ class Node(BaseModel, NodeContent):
         self.activate_revision(user, revision)
         return revision
 
-    def activate_revision(self, user, revision):
+    def activate_revision(self, user, revision, *extensions):
         self.title = revision.title
         self.tagnames = revision.tagnames
-        self.body = revision.body
+        self.body = self._as_markdown(revision.body, *extensions)
 
         self.active_revision = revision
         self.update_last_activity(user)
@@ -370,6 +405,18 @@ class Node(BaseModel, NodeContent):
                 tag.add_to_usage_count(1)
                 tag.save()
 
+    def delete(self, *args, **kwargs):
+        self.active_revision = None
+        self.save()
+
+        for n in self.children.all():
+            n.delete()
+
+        for a in self.actions.all():
+            a.cancel()
+
+        super(Node, self).delete(*args, **kwargs)
+
     def save(self, *args, **kwargs):
         tags_changed = self._process_changes_in_tags()
 
@@ -378,7 +425,8 @@ class Node(BaseModel, NodeContent):
             super(BaseModel, self).save(*args, **kwargs)
             self.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames,
                                                          body=self.body)
-            self.update_last_activity(self.author)
+            self.activate_revision(self.author, self.active_revision)
+            self.update_last_activity(self.author, time=self.added_at)
 
         if self.parent_id and not self.abs_parent_id:
             self.abs_parent = self.parent.absolute_parent