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

Merge pull request #945 from ahorek/find_by_fix

Browse Source 
find_by fix
This commit is contained in:
Karel Picman 2019-01-09 10:28:00 +01:00 committed by GitHub
commit cb1601f783
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 8 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