From f795d5180d27ed8eae1398bd8053a123df69970a Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Tue, 5 Jan 2021 09:11:22 +0100 Subject: [PATCH] Fix file previews bugs [SCI-5284] (#3026) --- app/assets/stylesheets/shared/assets.scss | 1 - app/controllers/assets_controller.rb | 1 + app/services/marvin_js_service.rb | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/shared/assets.scss b/app/assets/stylesheets/shared/assets.scss index c4408b119..07a977f44 100644 --- a/app/assets/stylesheets/shared/assets.scss +++ b/app/assets/stylesheets/shared/assets.scss @@ -4,7 +4,6 @@ @include md-card-style; grid-row: span 6; height: 23em; - overflow: hidden; padding: 1em; position: relative; width: var(--attachment-column-width); diff --git a/app/controllers/assets_controller.rb b/app/controllers/assets_controller.rb index e7abe9e37..ea098a6a1 100644 --- a/app/controllers/assets_controller.rb +++ b/app/controllers/assets_controller.rb @@ -161,6 +161,7 @@ class AssetsController < ApplicationController render_403 && return unless can_manage_protocol_in_module?(step.protocol) || can_manage_protocol_in_repository?(step.protocol) step_asset = StepAsset.create!(step: step, asset: asset) + asset.update!(view_mode: step.assets_view_mode) step.protocol&.update(updated_at: Time.zone.now) edit_url = edit_asset_url(step_asset.asset_id) diff --git a/app/services/marvin_js_service.rb b/app/services/marvin_js_service.rb index 3f37558dd..d530fba92 100644 --- a/app/services/marvin_js_service.rb +++ b/app/services/marvin_js_service.rb @@ -49,6 +49,7 @@ class MarvinJsService def connect_asset(asset, params, current_user) if params[:object_type] == 'Step' object = params[:object_type].constantize.find(params[:object_id]) + asset.update!(view_mode: object.assets_view_mode) object.assets << asset elsif params[:object_type] == 'Result' my_module = MyModule.find_by(id: params[:object_id])