diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2021-08-11 21:52:04 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2021-08-11 21:52:04 +0000 |
| commit | b897b13ba8212b9ede6fa207483bcb69c8ec6fa9 (patch) | |
| tree | e4632e5d8e9448da4dfe0745945829c4d9e29ec2 | |
| parent | c1b3804555994cb81ba6742894124f9d8c42e05c (diff) | |
| download | redmine-b897b13ba8212b9ede6fa207483bcb69c8ec6fa9.tar.gz redmine-b897b13ba8212b9ede6fa207483bcb69c8ec6fa9.zip | |
Render markdown attachments using markdown or common_mark based on the text formatting setting (#32424).
Patch by Marius BĂLTEANU and Martin Cizek.
git-svn-id: http://svn.redmine.org/redmine/trunk@21165 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 10 | ||||
| -rw-r--r-- | app/helpers/attachments_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/repositories/entry.html.erb | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0db895441..0618b614d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1837,6 +1837,16 @@ module ApplicationHelper ) end + # Returns the markdown formatter: markdown or common_mark + # ToDo: Remove this when markdown will be removed + def markdown_formatter + if Setting.text_formatting == "common_mark" + "common_mark" + else + "markdown" + end + end + private def wiki_helper diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index b59f9446f..f8f90df87 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -92,7 +92,7 @@ module AttachmentsHelper def render_file_content(attachment, content) if attachment.is_markdown? - render :partial => 'common/markup', :locals => {:markup_text_formatting => 'markdown', :markup_text => content} + render :partial => 'common/markup', :locals => {:markup_text_formatting => markdown_formatter, :markup_text => content} elsif attachment.is_textile? render :partial => 'common/markup', :locals => {:markup_text_formatting => 'textile', :markup_text => content} else diff --git a/app/views/repositories/entry.html.erb b/app/views/repositories/entry.html.erb index 4f8678bea..831e8044a 100644 --- a/app/views/repositories/entry.html.erb +++ b/app/views/repositories/entry.html.erb @@ -13,7 +13,7 @@ <% elsif Redmine::MimeType.of(@path) == 'text/x-textile' %> <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => 'textile', :markup_text => @content} %> <% elsif Redmine::MimeType.of(@path) == 'text/markdown' %> - <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => 'markdown', :markup_text => @content} %> + <%= render :partial => 'common/markup', :locals => {:markup_text_formatting => markdown_formatter, :markup_text => @content} %> <% elsif @content %> <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %> <% else %> |