Commit 8a7f288e by benjaoming

Merge pull request #278 from PolyLAN/fix_262

Fix #262 for attachements
parents 9100c424 1445ad58
...@@ -27,8 +27,8 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor): ...@@ -27,8 +27,8 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor):
m = ATTACHMENT_RE.match(line) m = ATTACHMENT_RE.match(line)
if m: if m:
attachment_id = m.group('id').strip() attachment_id = m.group('id').strip()
before = m.group('before') before = self.run([m.group('before')])[0]
after = m.group('after') after = self.run([m.group('after')])[0]
try: try:
attachment = models.Attachment.objects.get( attachment = models.Attachment.objects.get(
articles__current_revision__deleted=False, articles__current_revision__deleted=False,
...@@ -36,7 +36,7 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor): ...@@ -36,7 +36,7 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor):
) )
url = reverse('wiki:attachments_download', kwargs={'article_id': self.markdown.article.id, url = reverse('wiki:attachments_download', kwargs={'article_id': self.markdown.article.id,
'attachment_id':attachment.id,}) 'attachment_id':attachment.id,})
# The readability of the attachment is decided relative # The readability of the attachment is decided relative
# to the owner of the original article. # to the owner of the original article.
# I.e. do not insert attachments in other articles that # I.e. do not insert attachments in other articles that
...@@ -47,14 +47,14 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor): ...@@ -47,14 +47,14 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor):
html = render_to_string( html = render_to_string(
"wiki/plugins/attachments/render.html", "wiki/plugins/attachments/render.html",
Context({ Context({
'url': url, 'url': url,
'filename': attachment.original_filename, 'filename': attachment.original_filename,
'attachment_can_read': attachment_can_read, 'attachment_can_read': attachment_can_read,
})) }))
line = self.markdown.htmlStash.store(html, safe=True) line = self.markdown.htmlStash.store(html, safe=True)
except models.Attachment.DoesNotExist: except models.Attachment.DoesNotExist:
line = line.replace(m.group(1), """<span class="attachment attachment-deleted">Attachment with ID #%s is deleted.</span>""" % attachment_id) line = line.replace(m.group(1), """<span class="attachment attachment-deleted">Attachment with ID #%s is deleted.</span>""" % attachment_id)
line = before + line + after line = before + line + after
new_text.append(line) new_text.append(line)
return new_text return new_text
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment