redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel-2.0.0

Browse Source
This commit is contained in:
Karel Pičman 2019-01-09 10:32:43 +01:00
commit 91b3e3fec5
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/dmsf_controller.rb
View File

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

2
app/controllers/dmsf_workflows_controller.rb
View File

@ -249,7 +249,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

2
app/models/dmsf_file_revision.rb
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