X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/b25ea1aa5c57245fbc66dbb802fb228f0f724870..97d088726443a6b1c682cf629b5662c54bfbb291:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index 6a18165..ebe9139 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -331,13 +331,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, *extensions): + def activate_revision(self, user, revision, extensions=['urlize']): self.title = revision.title self.tagnames = revision.tagnames - self.body = self._as_markdown(revision.body, *extensions) + + 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) @@ -418,8 +421,6 @@ 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) @@ -430,8 +431,11 @@ class Node(BaseModel, NodeContent): 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: