scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-16 16:57:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2042 from biosistemika/hotfix-september

Browse source 
Hotfix september
This commit is contained in:
mlorb 2019-09-10 13:53:28 +02:00 • committed by GitHub
commit cf8c98dfa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1.16.8
1.16.9

23
app/controllers/api/v1/results_controller.rb
View file

@ -45,9 +45,19 @@ module Api
end
def create_text_result
result_text_params[:text] = convert_old_tiny_mce_format(result_text_params[:text])
result_text = ResultText.new(text: result_text_params[:text])
result_text.transaction do
Result.transaction do
@result = Result.create!(
user: current_user,
my_module: @task,
name: result_params[:name],
last_modified_by: current_user
)
result_text = ResultText.create!(
result: @result,
text: convert_old_tiny_mce_format(result_text_params[:text])
)
if tiny_mce_asset_params.present?
tiny_mce_asset_params.each do |t|
image_params = t[:attributes]
@ -66,13 +76,8 @@ module Api
)
result_text.text.sub!("data-mce-token=\"#{token}\"", "data-mce-token=\"#{Base62.encode(tiny_image.id)}\"")
end
result_text.save!
end
@result = Result.new(user: current_user,
my_module: @task,
name: result_params[:name],
result_text: result_text,
last_modified_by: current_user)
@result.save! && result_text.save!
end
end