X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/26dc6264fd04855c752b03517707bd94f76284ee..80e81e8ba3e132d6b51a0bb4c794d8f2c1f600d9:/forum/models/node.py?ds=inline diff --git a/forum/models/node.py b/forum/models/node.py index 9e734d2..cf69233 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -2,6 +2,7 @@ from base import * from tag import Tag 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.html import sanitize_html @@ -18,7 +19,10 @@ class NodeContent(models.Model): @property def html(self): - return mark_safe(sanitize_html(markdown.markdown(self.body))) + return self.as_markdown() + + def as_markdown(self, *extensions): + return mark_safe(sanitize_html(markdown.markdown(self.body, extensions=extensions))) @property def headline(self): @@ -26,25 +30,26 @@ class NodeContent(models.Model): def tagname_list(self): if self.tagnames: - return [name for name in self.tagnames.split(u' ')] + t = [name.strip() for name in self.tagnames.split(u' ') if name] + return [name.strip() for name in self.tagnames.split(u' ') if name] else: return [] def tagname_meta_generator(self): - return u','.join([unicode(tag) for tag in self.tagname_list()]) + return u','.join([tag for tag in self.tagname_list()]) class Meta: abstract = True app_label = 'forum' -class NodeMetaClass(models.Model.__metaclass__): +class NodeMetaClass(BaseMetaClass): types = {} def __new__(cls, *args, **kwargs): new_cls = super(NodeMetaClass, cls).__new__(cls, *args, **kwargs) if not new_cls._meta.abstract and new_cls.__name__ is not 'Node': - NodeMetaClass.types[new_cls.__name__.lower()] = new_cls + NodeMetaClass.types[new_cls.get_type()] = new_cls return new_cls @@ -58,10 +63,7 @@ class NodeMetaClass(models.Model.__metaclass__): name = node_cls.__name__.lower() def children(self): - if node_cls._meta.proxy: - return node_cls.objects.filter(node_type=name, parent=self) - else: - return node_cls.objects.filter(parent=self) + return node_cls.objects.filter(parent=self) def parent(self): p = self.__dict__.get('_%s_cache' % name, None) @@ -76,10 +78,31 @@ class NodeMetaClass(models.Model.__metaclass__): Node.add_to_class(name, property(parent)) -node_create = django.dispatch.Signal(providing_args=['instance']) -node_edit = django.dispatch.Signal(providing_args=['instance']) +class NodeManager(CachedManager): + use_for_related_fields = True + + def get_query_set(self): + qs = super(NodeManager, self).get_query_set() + + if self.model is not Node: + return qs.filter(node_type=self.model.get_type()) + else: + return qs + + def get(self, *args, **kwargs): + node = super(NodeManager, self).get(*args, **kwargs) + cls = NodeMetaClass.types.get(node.node_type, None) + + if cls and node.__class__ is not cls: + return node.leaf + return node + + def get_for_types(self, types, *args, **kwargs): + kwargs['node_type__in'] = [t.get_type() for t in types] + return self.get(*args, **kwargs) -class Node(BaseModel, NodeContent, DeletableContent): + +class Node(BaseModel, NodeContent): __metaclass__ = NodeMetaClass node_type = models.CharField(max_length=16, default='node') @@ -87,24 +110,50 @@ class Node(BaseModel, NodeContent, DeletableContent): abs_parent = models.ForeignKey('Node', related_name='all_children', null=True) added_at = models.DateTimeField(default=datetime.datetime.now) + score = models.IntegerField(default=0) + + deleted = models.ForeignKey('Action', null=True, unique=True, related_name="deleted_node") + in_moderation = models.ForeignKey('Action', null=True, unique=True, related_name="moderated_node") + last_edited = models.ForeignKey('Action', null=True, unique=True, related_name="edited_node") + + last_activity_by = models.ForeignKey(User, null=True) + last_activity_at = models.DateTimeField(null=True, blank=True) tags = models.ManyToManyField('Tag', related_name='%(class)ss') + active_revision = models.OneToOneField('NodeRevision', related_name='active', null=True) - score = models.IntegerField(default=0) - vote_up_count = models.IntegerField(default=0) - vote_down_count = models.IntegerField(default=0) + extra_ref = models.ForeignKey('Node', null=True) + extra_count = models.IntegerField(default=0) + extra_action = models.ForeignKey('Action', null=True, related_name="extra_node") + + marked = models.BooleanField(default=False) + wiki = models.BooleanField(default=False) - comment_count = models.PositiveIntegerField(default=0) - offensive_flag_count = models.SmallIntegerField(default=0) + comment_count = DenormalizedField("children", node_type="comment", canceled=False) + flag_count = DenormalizedField("flags") - last_edited_at = models.DateTimeField(null=True, blank=True) - last_edited_by = models.ForeignKey(User, null=True, blank=True, related_name='last_edited_%(class)ss') + friendly_name = _("post") - active_revision = models.OneToOneField('NodeRevision', related_name='active', null=True) + objects = NodeManager() + + @classmethod + def cache_key(cls, pk): + return '%s.node:%s' % (settings.APP_URL, pk) + + @classmethod + def get_type(cls): + return cls.__name__.lower() @property def leaf(self): - return NodeMetaClass.types[self.node_type].objects.get(id=self.id) + leaf_cls = NodeMetaClass.types.get(self.node_type, None) + + if leaf_cls is None: + return self + + leaf = leaf_cls() + leaf.__dict__ = self.__dict__ + return leaf @property def absolute_parent(self): @@ -117,40 +166,44 @@ class Node(BaseModel, NodeContent, DeletableContent): def summary(self): return strip_tags(self.html)[:300] - def create_revision(self, user, **kwargs): - revision = NodeRevision(author=user, **kwargs) - - if not self.id: - self.author = user + @models.permalink + def get_revisions_url(self): + return ('revisions', (), {'id': self.id}) + + def update_last_activity(self, user, save=False): + self.last_activity_by = user + self.last_activity_at = datetime.datetime.now() + + if self.parent: + self.parent.update_last_activity(user, save=True) + + if save: self.save() - revision.revision = 1 - else: - revision.revision = self.revisions.aggregate(last=models.Max('revision'))['last'] + 1 - revision.node_id = self.id + def _create_revision(self, user, number, **kwargs): + revision = NodeRevision(author=user, revision=number, node=self, **kwargs) revision.save() + return revision + + 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) + return revision def activate_revision(self, user, revision): self.title = revision.title self.tagnames = revision.tagnames self.body = revision.body - old_revision = self.active_revision self.active_revision = revision - - if not old_revision: - signal = node_create - else: - self.last_edited_at = datetime.datetime.now() - self.last_edited_by = user - signal = node_edit + self.update_last_activity(user) self.save() - signal.send(sender=self.__class__, instance=self) def get_tag_list_if_changed(self): dirty = self.get_dirty_fields() + active_user = self.last_edited and self.last_edited.by or self.author if 'tagnames' in dirty: new_tags = self.tagname_list() @@ -167,7 +220,7 @@ class Node(BaseModel, NodeContent, DeletableContent): try: tag = Tag.objects.get(name=name) except: - tag = Tag.objects.create(name=name, created_by=self.last_edited_by or self.author) + tag = Tag.objects.create(name=name, created_by=active_user or self.author) tag_list.append(tag) @@ -181,7 +234,7 @@ class Node(BaseModel, NodeContent, DeletableContent): tag = Tag.objects.get(name=name) tag.used_count = tag.used_count - 1 if tag.used_count == 0: - tag.mark_deleted(self.last_edited_by or self.author) + tag.mark_deleted(active_user) tag.save() return tag_list @@ -190,13 +243,14 @@ class Node(BaseModel, NodeContent, DeletableContent): def save(self, *args, **kwargs): if not self.id: - self.node_type = self.__class__.__name__.lower() + 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) if self.parent_id and not self.abs_parent_id: self.abs_parent = self.parent.absolute_parent - - self.__dict__['score'] = self.__dict__['vote_up_count'] - self.__dict__['vote_down_count'] - + tags = self.get_tag_list_if_changed() super(Node, self).save(*args, **kwargs) if tags is not None: self.tags = tags @@ -205,7 +259,7 @@ class Node(BaseModel, NodeContent, DeletableContent): app_label = 'forum' -class NodeRevision(NodeContent): +class NodeRevision(BaseModel, NodeContent): node = models.ForeignKey(Node, related_name='revisions') summary = models.CharField(max_length=300) revision = models.PositiveIntegerField() @@ -216,11 +270,3 @@ class NodeRevision(NodeContent): app_label = 'forum' -from user import ValidationHash - -class AnonymousNode(Node): - validation_hash = models.ForeignKey(Node, related_name='anonymous_content') - convertible_to = models.CharField(max_length=16, default='node') - - class Meta: - app_label = 'forum' \ No newline at end of file