From b4b5b5bb22e6de7f5d8686b3041c75e1ebbd130e Mon Sep 17 00:00:00 2001 From: Stuart Owen Date: Fri, 12 Jan 2024 10:05:13 +0000 Subject: [PATCH] final tweaks following checking PR #1710 --- app/helpers/samples_helper.rb | 6 +++--- app/models/data_file.rb | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/helpers/samples_helper.rb b/app/helpers/samples_helper.rb index 5fdb3ad214..a0c7b0bd50 100644 --- a/app/helpers/samples_helper.rb +++ b/app/helpers/samples_helper.rb @@ -301,8 +301,8 @@ def get_extra_info(sample) } end - # whether to attempt to show the extract samples button, the final check of whether there is a sample type will be done - # asynchronously + # whether to attempt to show the extract samples button, + # the final check of whether there is a sample type will be done asynchronously def attempt_to_show_extract_samples_button?(asset, display_asset) return false unless SampleType.any? && asset.can_manage? && asset.content_blob&.is_extractable_spreadsheet? return false unless asset.extracted_samples.empty? && (display_asset.version == asset.version) @@ -311,7 +311,7 @@ def attempt_to_show_extract_samples_button?(asset, display_asset) !(asset.sample_extraction_task&.success? && Seek::Samples::Extractor.new(asset).fetch.present?) rescue Seek::Samples::FetchException - true #allows to try again, the previous cached of results may be broken + true #allows to try again, the previous cached results may be broken end def show_sample_extraction_status?(data_file) diff --git a/app/models/data_file.rb b/app/models/data_file.rb index 31ec6acf90..1541a2823e 100644 --- a/app/models/data_file.rb +++ b/app/models/data_file.rb @@ -114,7 +114,6 @@ def supports_spreadsheet_explore? def matching_sample_type? return false if external_asset.is_a? OpenbisExternalAsset - Rails.logger.debug("Checking for matching sample template for data file ##{id}") possible_sample_types.any? end