X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/40e2851e2e2bf5e35063597b30ada01d06d2cc11..7fa400fc50e17b3c017615b296934945531fa715:/forum/models/node.py?ds=sidebyside diff --git a/forum/models/node.py b/forum/models/node.py index 36fbda9..afb04cf 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.utils.userlinking import auto_user_link +from forum.settings import SUMMARY_LENGTH from utils import PickledObjectField class NodeContent(models.Model): @@ -21,7 +23,10 @@ class NodeContent(models.Model): @property def html(self): - return self.as_markdown() + return self.body + + def rendered(self, content): + return auto_user_link(self, self._as_markdown(content, *['auto_linker'])) @classmethod def _as_markdown(cls, content, *extensions): @@ -38,11 +43,15 @@ class NodeContent(models.Model): @property def headline(self): - return self.title + title = self.title + + # Replaces multiple spaces with single ones. + title = re.sub(' +',' ', title) + + return title def tagname_list(self): if self.tagnames: - 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 [] @@ -78,13 +87,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)) @@ -146,10 +152,11 @@ class NodeManager(CachedManager): def get_query_set(self): qs = NodeQuerySet(self.model) + # If the node is an answer, question or comment we filter the Node model by type 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()) + + return qs def get_for_types(self, types, *args, **kwargs): kwargs['node_type__in'] = [t.get_type() for t in types] @@ -307,7 +314,15 @@ class Node(BaseModel, NodeContent): @property def summary(self): - return strip_tags(self.html)[:300] + content = strip_tags(self.html)[:SUMMARY_LENGTH] + + # Remove multiple spaces. + content = re.sub(' +',' ', content) + + # Remove line breaks. We don't need them at all. + content = content.replace("\n", '') + + return content @models.permalink def get_revisions_url(self): @@ -340,13 +355,26 @@ class Node(BaseModel, NodeContent): def activate_revision(self, user, revision): self.title = revision.title self.tagnames = revision.tagnames - self.body = revision.body + + self.body = self.rendered(revision.body) self.active_revision = revision self.update_last_activity(user) self.save() + def get_active_users(self, active_users = None): + if not active_users: + active_users = set() + + active_users.add(self.author) + + for node in self.children.all(): + if not node.nis.deleted: + node.get_active_users(active_users) + + return active_users + def _list_changes_in_tags(self): dirty = self.get_dirty_fields() @@ -375,7 +403,7 @@ class Node(BaseModel, NodeContent): for name in tag_changes['added']: try: tag = Tag.objects.get(name=name) - except: + except Tag.DoesNotExist: tag = Tag.objects.create(name=name, created_by=self._last_active_user()) if not self.nis.deleted: @@ -409,6 +437,10 @@ class Node(BaseModel, NodeContent): tag.save() def delete(self, *args, **kwargs): + for tag in self.tags.all(): + tag.add_to_usage_count(-1) + tag.save() + self.active_revision = None self.save() @@ -421,20 +453,22 @@ class Node(BaseModel, NodeContent): 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.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())) + if tags_changed: + self.tags = list(Tag.objects.filter(name__in=self.tagname_list())) class Meta: app_label = 'forum'