From 305e9dc109e1c084054d0797582a373cbd4bcf61 Mon Sep 17 00:00:00 2001 From: Anton Ignatov Date: Wed, 25 Sep 2019 13:45:34 +0200 Subject: [PATCH] Fix error handling and rubocop error --- app/models/concerns/active_storage_concerns.rb | 2 ++ app/models/concerns/tiny_mce_images.rb | 2 +- app/models/team.rb | 2 +- app/models/tiny_mce_asset.rb | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/active_storage_concerns.rb b/app/models/concerns/active_storage_concerns.rb index 6166a967a..97f38d492 100644 --- a/app/models/concerns/active_storage_concerns.rb +++ b/app/models/concerns/active_storage_concerns.rb @@ -24,5 +24,7 @@ module ActiveStorageConcerns temp_file.flush temp_file.rewind target.attach(io: temp_file, filename: blob.filename, metadata: blob.metadata) + rescue StandardError => e + Rails.logger.error e.message end end diff --git a/app/models/concerns/tiny_mce_images.rb b/app/models/concerns/tiny_mce_images.rb index 558199d95..d9a9cf6b1 100644 --- a/app/models/concerns/tiny_mce_images.rb +++ b/app/models/concerns/tiny_mce_images.rb @@ -83,7 +83,7 @@ module TinyMceImages end def copy_unknown_tiny_mce_images - asset_team_id = Team.find_by_object(self).id + asset_team_id = Team.search_by_object(self).id return unless asset_team_id object_field = Extends::RICH_TEXT_FIELD_MAPPINGS[self.class.name] diff --git a/app/models/team.rb b/app/models/team.rb index a3d06179c..f29227fb5 100644 --- a/app/models/team.rb +++ b/app/models/team.rb @@ -218,7 +218,7 @@ class Team < ApplicationRecord query.select(:id, :name).map { |i| { id: i[:id], name: ApplicationController.helpers.escape_input(i[:name]) } } end - def self.find_by_object(obj) + def self.search_by_object(obj) find( case obj.class.name when 'Protocol' diff --git a/app/models/tiny_mce_asset.rb b/app/models/tiny_mce_asset.rb index 50e3fbdf7..9e02c4e95 100644 --- a/app/models/tiny_mce_asset.rb +++ b/app/models/tiny_mce_asset.rb @@ -47,7 +47,7 @@ class TinyMceAsset < ApplicationRecord end images.each do |image| image_to_update = find_by(id: Base62.decode(image)) - next if image_to_update.object || image_to_update.team_id != Team.find_by(object: object).id + next if image_to_update.object || image_to_update.team_id != Team.search_by_object(object).id image_to_update&.update(object: object, saved: true) create_create_marvinjs_activity(image_to_update, current_user)