X-Git-Url: https://git.openstreetmap.org/osqa.git/blobdiff_plain/a702df34f63291c9aa76a202824455d64fdd8bf9..082491645db310213a3c5c44d151b3f950eddfff:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index bf05cb5..65eb2dc 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -21,10 +21,20 @@ class NodeContent(models.Model): @property def html(self): - return self.as_markdown() + return self.body + + @classmethod + def _as_markdown(cls, content, *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 mark_safe(sanitize_html(markdown.markdown(self.body, extensions=extensions))) + return self._as_markdown(self.body, *extensions) @property def headline(self): @@ -58,7 +68,7 @@ class NodeMetaClass(BaseMetaClass): @classmethod def setup_relations(cls): for node_cls in NodeMetaClass.types.values(): - NodeMetaClass.setup_relation(node_cls) + NodeMetaClass.setup_relation(node_cls) @classmethod def setup_relation(cls, node_cls): @@ -68,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)) @@ -91,12 +98,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 @@ -167,7 +206,6 @@ class NodeStateQuery(object): return "(%s)" % name in node.state_string - class Node(BaseModel, NodeContent): __metaclass__ = NodeMetaClass @@ -206,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() @@ -242,11 +280,22 @@ 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 - @property + @property def absolute_parent(self): if not self.abs_parent_id: return self @@ -261,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() @@ -279,13 +331,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 = self._as_markdown(revision.body, *extensions) self.active_revision = revision self.update_last_activity(user) @@ -305,10 +357,10 @@ class Node(BaseModel, NodeContent): new_tags = set(name for name in self.tagnames.split(u' ') if name) return dict( - current=list(new_tags), - added=list(new_tags - old_tags), - removed=list(old_tags - new_tags) - ) + current=list(new_tags), + added=list(new_tags - old_tags), + removed=list(old_tags - new_tags) + ) def _last_active_user(self): return self.last_edited and self.last_edited.by or self.author @@ -324,14 +376,14 @@ class Node(BaseModel, NodeContent): tag = Tag.objects.create(name=name, created_by=self._last_active_user()) if not self.nis.deleted: - tag.used_count = models.F('used_count') + 1 + tag.add_to_usage_count(1) tag.save() if not self.nis.deleted: for name in tag_changes['removed']: try: tag = Tag.objects.get(name=name) - tag.used_count = models.F('used_count') - 1 + tag.add_to_usage_count(-1) tag.save() except: pass @@ -346,21 +398,35 @@ class Node(BaseModel, NodeContent): if action: for tag in self.tags.all(): - tag.used_count = models.F('used_count') - 1 + tag.add_to_usage_count(-1) tag.save() else: for tag in Tag.objects.filter(name__in=self.tagname_list()): - tag.used_count = models.F('used_count') + 1 + 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() - + 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.active_revision = self._create_revision(self.author, 1, title=self.title, tagnames=self.tagnames, + body=self.body) + 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