From 8837d7709490acdc8471c3818f2dfbdf44eb8634 Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 3 Jan 2019 02:13:34 +0100 Subject: [PATCH 1/2] wrong find_by usage --- app/controllers/dmsf_workflows_controller.rb | 2 +- app/models/dmsf_file_revision.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 10605cdc..14456a66 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -253,7 +253,7 @@ class DmsfWorkflowsController < ApplicationController if params[:dmsf_workflow] && params[:dmsf_workflow][:name].present? @dmsf_workflow.name = params[:dmsf_workflow][:name] elsif params[:dmsf_workflow] && params[:dmsf_workflow][:id].present? - names = DmsfWorkflow.find_by(id: params[:dmsf_workflow][:id]).pluck(:name) + names = DmsfWorkflow.where(id: params[:dmsf_workflow][:id]).pluck(:name) @dmsf_workflow.name = names.first end diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 596d4e7d..ae914700 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -224,7 +224,7 @@ class DmsfFileRevision < ActiveRecord::Base def workflow_str(name) str = '' if name && dmsf_workflow_id - names = DmsfWorkflow.find_by(id: dmsf_workflow_id).pluck(:name) + names = DmsfWorkflow.where(id: dmsf_workflow_id).pluck(:name) str = "#{names.first} - " if names.any? end case workflow From 151c454b1560418de2418fcb1cdf309fd154021b Mon Sep 17 00:00:00 2001 From: pavel Date: Tue, 8 Jan 2019 23:52:57 +0100 Subject: [PATCH 2/2] find_by fix --- app/controllers/dmsf_controller.rb | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index e545bbe9..cd2ca7ff 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -122,18 +122,12 @@ class DmsfController < ApplicationController if selected_dir_links.present? && (params[:email_entries].present? || params[:download_entries].present?) - selected_dir_links.each do |id| - target_id = DmsfLink.find_by(id: id).pluck(:target_id).first - selected_folders << target_id if target_id && !selected_folders.include?(target_id) - end + selected_folders = DmsfLink.where(id: selected_dir_links).pluck(:target_id) | selected_folders end if selected_file_links.present? && (params[:email_entries].present? || params[:download_entries].present?) - selected_file_links.each do |id| - target_id = DmsfLink.find_by(id: id).pluck(:target_id).first - selected_files << target_id if target_id && !selected_files.include?(target_id) - end + selected_files = DmsfLink.where(id: selected_file_links).pluck(:target_id) | selected_files end begin