Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-wiki
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
django-wiki
Commits
8a7f288e
Commit
8a7f288e
authored
Jul 08, 2014
by
benjaoming
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #278 from PolyLAN/fix_262
Fix #262 for attachements
parents
9100c424
1445ad58
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
wiki/plugins/attachments/markdown_extensions.py
+6
-6
No files found.
wiki/plugins/attachments/markdown_extensions.py
View file @
8a7f288e
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment