Merge pull request #942 from ahorek/find_by_fix

wrong find_by usage
This commit is contained in:
Karel Picman 2019-01-03 10:04:03 +01:00 committed by GitHub
commit 94aabaec79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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