X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/745f67c37acdb9574c5297004adde2b9a7da5fdb..cf523df2eb6e7b696c693e68b449a2c541bbaa67:/forum/models/node.py diff --git a/forum/models/node.py b/forum/models/node.py index 7449082..6d51793 100644 --- a/forum/models/node.py +++ b/forum/models/node.py @@ -7,8 +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 forum.modules import MODULES_PACKAGE from utils import PickledObjectField class NodeContent(models.Model): @@ -25,8 +25,11 @@ class NodeContent(models.Model): def html(self): 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): + def _as_markdown_raw(cls, content, *extensions): try: return mark_safe(sanitize_html(markdown.markdown(content, extensions=extensions))) except Exception, e: @@ -35,17 +38,26 @@ class NodeContent(models.Model): str(e), cls.__name__, str(e), traceback.format_exc())) return '' + # Replace \ with \\ to preserve backslashes during markdown processing + @classmethod + def _as_markdown(cls, content, *extensions): + return cls._as_markdown_raw(content.replace('\\','\\\\'), *extensions) + def as_markdown(self, *extensions): return self._as_markdown(self.body, *extensions) @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] + return [name.strip() for name in self.tagnames.split() if name] else: return [] @@ -143,29 +155,12 @@ 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 the node is an answer, question or comment we filter the Node model by type if self.model is not Node: 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): @@ -324,7 +319,15 @@ class Node(BaseModel, NodeContent): @property def summary(self): - return strip_tags(self.html)[:SUMMARY_LENGTH] + 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): @@ -351,22 +354,59 @@ 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, extensions=['urlize']) + self.activate_revision(user, revision) return revision - def activate_revision(self, user, revision, extensions=['urlize']): + def activate_revision(self, user, revision): 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.body = self.rendered(revision.body) self.active_revision = revision - self.update_last_activity(user) + + # Try getting the previous revision + try: + prev_revision = NodeRevision.objects.get(node=self, revision=revision.revision-1) + + update_activity = True + + # Do not update the activity if only the tags are changed + if prev_revision.title == revision.title and prev_revision.body == revision.body \ + and prev_revision.tagnames != revision.tagnames and not settings.UPDATE_LATEST_ACTIVITY_ON_TAG_EDIT: + update_activity = False + except NodeRevision.DoesNotExist: + update_activity = True + finally: + if update_activity: + 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 get_last_edited(self): + if not self.last_edited: + try: + le = self.actions.exclude(action_type__in=('voteup', 'votedown', 'flag'), canceled=True).order_by('-action_date')[0] + self.last_edited = le + self.save() + except: + pass + + return self.last_edited + + def _list_changes_in_tags(self): dirty = self.get_dirty_fields() @@ -374,10 +414,10 @@ class Node(BaseModel, NodeContent): return None else: if self._original_state['tagnames']: - old_tags = set(name for name in self._original_state['tagnames'].split(u' ')) + old_tags = set(self._original_state['tagnames'].split()) else: old_tags = set() - new_tags = set(name for name in self.tagnames.split(u' ') if name) + new_tags = set(self.tagnames.split()) return dict( current=list(new_tags), @@ -395,7 +435,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: @@ -429,6 +469,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() @@ -455,8 +499,11 @@ class Node(BaseModel, NodeContent): 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: + if self.tagnames.strip(): + self.tags = list(Tag.objects.filter(name__in=self.tagname_list())) + else: + self.tags = [] class Meta: app_label = 'forum'