Skip to content

Reuse 'apply_markdown' function in 'render_markdown' templatetag func #5469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carltongibson merged 3 commits into from
Oct 2, 2017
Merged

Reuse 'apply_markdown' function in 'render_markdown' templatetag func #5469

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbedc5c
reused 'apply_markdown' function in 'render_markdown' templatetag fun…
nastasi-oq Oct 1, 2017
2bc4d75
Merge remote-tracking branch 'origin/master' into markdown-refact
nastasi-oq Oct 1, 2017
64a876d
typo fixed
nastasi-oq Oct 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
reused 'apply_markdown' function in 'render_markdown' templatetag fun… 
…ction
  • Loading branch information
@nastasi-oq
nastasi-oq committed Oct 1, 2017
commit bbedc5c896800de4b23b5042e10b61a0e85222db
7 changes: 4 additions & 3 deletions rest_framework/templatetags/rest_framework.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
from django.utils.safestring import SafeData, mark_safe

from rest_framework.compat import (
NoReverseMatch, markdown, pygments_highlight, reverse, template_render
NoReverseMatch, apply_markdown, pygments_highlight, reverse,
template_render,
)
from rest_framework.renderers import HTMLFormRenderer
from rest_framework.utils.urls import replace_query_param
Expand Down Expand Up @@ -68,9 +69,9 @@ def form_for_link(link):

@register.simple_tag
def render_markdown(markdown_text):
if not markdown:
if apply_markdown is None:
return markdown_text
return mark_safe(markdown.markdown(markdown_text))
return mark_safe(apply_markdown(markdown_text))


@register.simple_tag
Expand Down