Commit a2eb822a authored by pierre.tremouilhac's avatar pierre.tremouilhac
Browse files

Merge branch '574-report-standard-add-reaction-short_label' into 'development'

Resolve "Report standard - add reaction short_label"

Closes #574

See merge request ComPlat/chemotion_ELN!813
parents 02dac2b0 a2d97f29
......@@ -87,11 +87,11 @@ class Report < ActiveRecord::Base
when 'spectrum'
Rails.root.join('lib', 'template', 'Spectra.docx')
when 'single_reaction'
Rails.root.join('lib', 'template', 'ELN_Objs.docx')
Rails.root.join('lib', 'template', 'Standard.docx')
when 'rxn_list_html'
Rails.root.join('lib', 'template', 'rxn_list.html.erb')
else
Rails.root.join('lib', 'template', 'ELN_Objs.docx')
Rails.root.join('lib', 'template', 'Standard.docx')
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment