scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-29 03:35:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1747 from biosistemika/lm-sci-3438-fix

Browse source 
Fix TinyMCE images in task description and task protocol description view [SCI-3438]
This commit is contained in:
Miha Mencin 2019-05-13 10:56:30 +02:00 committed by GitHub
commit 765c6ebd6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/views/my_modules/_module_header.html.erb
View file

@ -63,8 +63,8 @@
<div class="badge-icon">
<span class="fas fa-tags"></span>
</div>
<span class="hidden-xs hidden-sm tags-title"><%=t "my_modules.module_header.tags" %></span>
<%= render partial: "my_modules/tags", locals: { my_module: @my_module, editable: can_manage_module?(@my_module) } %>
<span class="hidden-xs hidden-sm tags-title"><%=t "my_modules.module_header.tags" %></span>
<%= render partial: "my_modules/tags", locals: { my_module: @my_module, editable: can_manage_module?(@my_module) } %>
</div>
</div>
@ -77,7 +77,7 @@
<% if can_manage_module?(@my_module) %>
<%= render partial: "description_form" %>
<% elsif @my_module.description.present? %>
<%= custom_auto_link(@my_module.description,
<%= custom_auto_link(@my_module.tinymce_render(:description),
simple_format: false,
tags: %w(img),
team: current_team) %>

2
app/views/my_modules/protocols.html.erb
View file

@ -40,7 +40,7 @@
}
%>
<% elsif @my_module.protocol.description.present? %>
<%= custom_auto_link(@my_module.protocol.description,
<%= custom_auto_link(@my_module.protocol.tinymce_render(:description),
simple_format: false,
tags: %w(img),
team: current_team) %>