From 1c5600f8206a5f20e009ec79bce6c2b7b76ddecc Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sat, 28 Jul 2018 15:24:24 +0000 Subject: [PATCH] Use pluck(:id) instead of collect(&:id) (#26711). Patch by jwjw yy. git-svn-id: http://svn.redmine.org/redmine/trunk@17454 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/versions_controller.rb | 2 +- app/models/issue.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index a5364169e..30fdc9313 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -34,7 +34,7 @@ class VersionsController < ApplicationController @trackers = @project.trackers.sorted.to_a retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?}) @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') - project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id] + project_ids = @with_subprojects ? @project.self_and_descendants.pluck(:id) : [@project.id] @versions = @project.shared_versions.preload(:custom_values) @versions += @project.rolled_up_versions.visible.preload(:custom_values) if @with_subprojects diff --git a/app/models/issue.rb b/app/models/issue.rb index 114d96208..d04705d58 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1383,7 +1383,7 @@ class Issue < ActiveRecord::Base # Unassigns issues from versions that are no longer shared # after +project+ was moved def self.update_versions_from_hierarchy_change(project) - moved_project_ids = project.self_and_descendants.reload.collect(&:id) + moved_project_ids = project.self_and_descendants.reload.pluck(:id) # Update issues of the moved projects and issues assigned to a version of a moved project Issue.update_versions( ["#{Version.table_name}.project_id IN (?) OR #{Issue.table_name}.project_id IN (?)",