X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/3c3864586d0d186ca2408c1016052db1d3c4dc55..dfcd16216da92b7011fad163462034e37f3c6996:/forum/models/node.py?ds=sidebyside diff --git a/forum/models/node.py b/forum/models/node.py index bebd07c..43d12b3 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -6,6 +6,7 @@ import markdown from django.utils.translation import ugettext as _ from django.utils.safestring import mark_safe from django.utils.html import strip_tags +from forum.utils.userlinking import auto_user_link from forum.utils.html import sanitize_html from utils import PickledObjectField @@ -21,11 +22,17 @@ class NodeContent(models.Model): @property def html(self): - return self.as_markdown() + return self.body @classmethod def _as_markdown(cls, content, *extensions): - return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions))) + try: + return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions))) + except Exception, e: + import traceback + logging.error("Caught exception %s in markdown parser rendering %s %s:\s %s" % ( + str(e), cls.__name__, str(e), traceback.format_exc())) + return '' def as_markdown(self, *extensions): return self._as_markdown(self.body, *extensions) @@ -72,13 +79,10 @@ class NodeMetaClass(BaseMetaClass): return node_cls.objects.filter(parent=self) def parent(self): - p = self.__dict__.get('_%s_cache' % name, None) - - 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 + if (self.parent is not None) and self.parent.node_type == name: + return self.parent.leaf - return p + return None Node.add_to_class(name + 's', property(children)) Node.add_to_class(name, property(parent)) @@ -95,12 +99,44 @@ class NodeQuerySet(CachedQuerySet): return super(NodeQuerySet, self).obj_from_datadict(datadict) def get(self, *args, **kwargs): - return super(NodeQuerySet, self).get(*args, **kwargs).leaf + node = super(NodeQuerySet, self).get(*args, **kwargs).leaf + + if not isinstance(node, self.model): + raise self.model.DoesNotExist() + + 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()]) + def children_count(self, child_type): + return NodeMetaClass.types[child_type].objects.filter_state(deleted=False).filter(parent__in=self).count() + class NodeManager(CachedManager): use_for_related_fields = True @@ -209,7 +245,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() @@ -245,6 +281,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 @@ -264,12 +311,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() @@ -282,13 +332,13 @@ class Node(BaseModel, NodeContent): def create_revision(self, user, **kwargs): number = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1 revision = self._create_revision(user, number, **kwargs) - self.activate_revision(user, revision) + self.activate_revision(user, revision, extensions=['urlize']) return revision - def activate_revision(self, user, revision): + def activate_revision(self, user, revision, extensions=['urlize']): self.title = revision.title self.tagnames = revision.tagnames - self.body = revision.body + self.body = auto_user_link(self, self._as_markdown(revision.body, *extensions)) self.active_revision = revision self.update_last_activity(user) @@ -349,27 +399,41 @@ class Node(BaseModel, NodeContent): if action: for tag in self.tags.all(): - tag.tag.add_to_usage_count(-1) + tag.add_to_usage_count(-1) tag.save() else: for tag in Tag.objects.filter(name__in=self.tagname_list()): tag.add_to_usage_count(1) tag.save() - def save(self, *args, **kwargs): - tags_changed = self._process_changes_in_tags() + 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): if not self.id: self.node_type = self.get_type() 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 - + + tags_changed = self._process_changes_in_tags() + super(Node, self).save(*args, **kwargs) + if tags_changed: self.tags = list(Tag.objects.filter(name__in=self.tagname_list())) class Meta: