scinote-web/app/views/results/_result_text.html.erb at f1483e4cad0eddd6203c8a62c030beb14b80719e - scinote-eln/scinote-web - Forgejo: Beyond coding. We forge.

scinote-eln/scinote-web

mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-07 23:44:55 +08:00

Luka Murn 53699193a2 Merge branch 'smart-annotations'

Conflicts:
	app/assets/javascripts/comments.js.erb
	app/assets/javascripts/protocols/index.js
	app/assets/javascripts/protocols/steps.js.erb
	app/assets/javascripts/samples/sample_datatable.js.erb
	app/controllers/my_module_comments_controller.rb
	app/controllers/project_comments_controller.rb
	app/controllers/result_comments_controller.rb
	app/controllers/step_comments_controller.rb
	app/datatables/sample_datatable.rb
	app/views/my_module_comments/_comment.html.erb
	app/views/project_comments/_comment.html.erb
	app/views/projects/show/_experiment.html.erb
	app/views/reports/elements/_experiment_element.html.erb
	app/views/reports/elements/_result_comments_element.html.erb
	app/views/reports/elements/_result_text_element.html.erb
	app/views/reports/elements/_step_checklist_element.html.erb
	app/views/reports/elements/_step_comments_element.html.erb
	app/views/reports/elements/_step_element.html.erb
	app/views/result_comments/_comment.html.erb
	app/views/results/_result_text.html.erb
	app/views/step_comments/_comment.html.erb
	app/views/steps/_step.html.erb
	db/schema.rb

2017-01-24 14:33:23 +01:00

6 lines

247 B

Text

Raw Blame History

 <div class="ql-editor">
   <%= auto_link(smart_annotation_parser(simple_format(sanitize_input(result.result_text.text))),
                 link: :urls,
                 sanitize: false,
                 html: { target: '_blank' }).html_safe %>
 </div>