scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-05 07:03:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1739 from aignatov-bio/ai-sci-3425-add-smart-annotation-to-protocol-description

Browse source 
Fix smart annotation in protocols in repository [SCI-3425]
This commit is contained in:
aignatov-bio 2019-05-09 15:36:42 +02:00 committed by GitHub
commit 3bb268459f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/protocols_controller.rb
View file

@ -3,6 +3,9 @@ class ProtocolsController < ApplicationController
include RenamingUtil include RenamingUtil
include ProtocolsImporter include ProtocolsImporter
include ProtocolsExporter include ProtocolsExporter
include ActionView::Helpers::TextHelper
include ActionView::Helpers::UrlHelper
include ApplicationHelper
include InputSanitizeHelper include InputSanitizeHelper
include ProtocolsIoHelper include ProtocolsIoHelper
include TeamsHelper include TeamsHelper
@ -222,9 +225,11 @@ class ProtocolsController < ApplicationController
if @protocol.update(description: params.require(:protocol)[:description]) if @protocol.update(description: params.require(:protocol)[:description])
TinyMceAsset.update_images(@protocol, params[:tiny_mce_images]) TinyMceAsset.update_images(@protocol, params[:tiny_mce_images])
render json: { render json: {
html: sanitize_input( html: custom_auto_link(
@protocol.tinymce_render(:description) @protocol.tinymce_render(:description),
) simple_format: false,
tags: %w(img),
team: current_team)
} }
else else
render json: @protocol.errors, status: :unprocessable_entity render json: @protocol.errors, status: :unprocessable_entity