diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /app/models/tracker.rb | |
parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/tracker.rb')
-rw-r--r-- | app/models/tracker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/tracker.rb b/app/models/tracker.rb index 20ba84527..b4f22c811 100644 --- a/app/models/tracker.rb +++ b/app/models/tracker.rb @@ -63,7 +63,7 @@ class Tracker < ActiveRecord::Base connection.select_rows("SELECT DISTINCT old_status_id, new_status_id FROM #{WorkflowTransition.table_name} WHERE tracker_id = #{id} AND type = 'WorkflowTransition'"). flatten. uniq - @issue_statuses = IssueStatus.where(:id => ids).all.sort + @issue_statuses = IssueStatus.where(:id => ids).to_a.sort end def disabled_core_fields @@ -92,7 +92,7 @@ class Tracker < ActiveRecord::Base # Returns the fields that are disabled for all the given trackers def self.disabled_core_fields(trackers) if trackers.present? - trackers.uniq.map(&:disabled_core_fields).reduce(:&) + trackers.map(&:disabled_core_fields).reduce(:&) else [] end |