X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/77c7fb49881b1df98ce3584468105ba78740fd48..1d2ed435b83b7f428e0615f7a78e21e8672c3c75:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index 0f8f5d3..7449082 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -7,6 +7,8 @@ from django.utils.translation import ugettext as _ from django.utils.safestring import mark_safe from django.utils.html import strip_tags from forum.utils.html import sanitize_html +from forum.settings import SUMMARY_LENGTH +from forum.modules import MODULES_PACKAGE from utils import PickledObjectField class NodeContent(models.Model): @@ -21,7 +23,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 +80,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 +107,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()]) @@ -120,12 +143,30 @@ class NodeManager(CachedManager): use_for_related_fields = True def get_query_set(self): + CurrentUserHolder = None + + moderation_import = 'from %s.moderation.startup import CurrentUserHolder' % MODULES_PACKAGE + exec moderation_import + qs = NodeQuerySet(self.model) if self.model is not Node: - return qs.filter(node_type=self.model.get_type()) - else: - return qs + qs = qs.filter(node_type=self.model.get_type()) + + if CurrentUserHolder is not None: + user = CurrentUserHolder.user + + try: + filter_content = not user.is_staff and not user.is_superuser + except: + filter_content = True + + if filter_content: + qs = qs.exclude(state_string__contains="(in_moderation)").exclude(state_string__contains="(deleted)").exclude( + state_string__contains="(rejected)" + ) + + return qs def get_for_types(self, types, *args, **kwargs): kwargs['node_type__in'] = [t.get_type() for t in types] @@ -223,7 +264,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 +300,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 @@ -272,7 +324,7 @@ class Node(BaseModel, NodeContent): @property def summary(self): - return strip_tags(self.html)[:300] + return strip_tags(self.html)[:SUMMARY_LENGTH] @models.permalink def get_revisions_url(self): @@ -299,13 +351,16 @@ 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 + + from forum.utils.userlinking import auto_user_link + + self.body = auto_user_link(self, self._as_markdown(revision.body, *extensions)) self.active_revision = revision self.update_last_activity(user) @@ -373,20 +428,34 @@ class Node(BaseModel, NodeContent): 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.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: