From 6bd021d88a6132d4d9ebcdf581964abba0955382 Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Fri, 4 Dec 2020 11:47:24 +0100 Subject: [PATCH] Add gallery view after image update [SCI-5286] (#2993) * Add gallery view after image update [SCI-5286] --- app/controllers/assets_controller.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index d5dd91b41..919495540 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -35,8 +35,11 @@ class AssetsController < ApplicationController def toggle_view_mode @asset.view_mode = toggle_view_mode_params[:view_mode] if @asset.save(touch: false) - gallery_view_id = @assoc.id if @assoc.class == Step - + gallery_view_id = if @assoc.is_a?(Step) + @assoc.id + elsif @assoc.is_a?(Result) + @assoc.my_module.id + end html = render_to_string(partial: 'assets/asset.html.erb', locals: { asset: @asset, gallery_view_id: gallery_view_id @@ -102,10 +105,19 @@ class AssetsController < ApplicationController @asset.post_process_file(@asset.team) @asset.step&.protocol&.update(updated_at: Time.zone.now) - render_html = if @asset.step || @asset.result + render_html = if [Result, Step].include?(@assoc.class) + gallery_view_id = if @assoc.is_a?(Step) + @assoc.id + elsif @assoc.is_a?(Result) + @assoc.my_module.id + end + render_to_string( partial: 'assets/asset.html.erb', - locals: { asset: @asset }, + locals: { + asset: @asset, + gallery_view_id: gallery_view_id + }, formats: :html ) else