X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/2444d6ffd7995be782615589fb1d5aef2c8277ce..4f69eff9f09ed7ad63c4e5ade45c269eb2e7bcf9:/forum/models/node.py?ds=sidebyside diff --git a/forum/models/node.py b/forum/models/node.py index 43d12b3..d4d0442 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -6,8 +6,9 @@ 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.userlinking import auto_user_link 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): @@ -305,7 +306,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): @@ -338,6 +339,9 @@ class Node(BaseModel, NodeContent): def activate_revision(self, user, revision, extensions=['urlize']): self.title = revision.title self.tagnames = revision.tagnames + + from forum.utils.userlinking import auto_user_link + self.body = auto_user_link(self, self._as_markdown(revision.body, *extensions)) self.active_revision = revision