scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 23:15:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #869 from Zanz2/Tables_and_protocol_info_integration

Browse source 
Made the two seperate branches from previous jira issues work together (fixed a small bug)
This commit is contained in:
Zanz2 2017-11-14 11:26:48 +01:00 committed by GitHub
commit 8ba27f734e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/protocols_controller.rb
View file

@ -1086,9 +1086,10 @@ class ProtocolsController < ApplicationController
newj['0'] = {} newj['0'] = {}
newj['0']['position'] = 0 newj['0']['position'] = 0
newj['0']['name'] = 'Protocol info' newj['0']['name'] = 'Protocol info'
newj['0']['description'] = sanitize_input( newj['0']['tables'], table_str = protocolsio_string_to_table_element(
protocols_io_fill_desc(original_json).html_safe sanitize_input(protocols_io_fill_desc(original_json).html_safe)
) )
newj['0']['description'] = table_str
original_json['steps'].each_with_index do |step, pos_orig| # loop over steps original_json['steps'].each_with_index do |step, pos_orig| # loop over steps
i = pos_orig + 1 i = pos_orig + 1
# position of step (first, second.... etc), # position of step (first, second.... etc),