From 4074ca07718ff6928a69df3b6fff24a1d4e57cbf Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Fri, 20 Sep 2019 13:58:41 +0000 Subject: [PATCH] code clean up app/models/repository.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18486 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/repository.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/models/repository.rb b/app/models/repository.rb index 93c180a53..da13be29e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -421,19 +421,17 @@ class Repository < ActiveRecord::Base # Notes: # - this hash honnors the users mapping defined for the repository def stats_by_author - commits = Changeset.where("repository_id = ?", id).select("committer, user_id, count(*) as count").group("committer, user_id") - + commits = Changeset.where("repository_id = ?", id). + select("committer, user_id, count(*) as count").group("committer, user_id") # TODO: restore ordering ; this line probably never worked # commits.to_a.sort! {|x, y| x.last <=> y.last} - - changes = Change.joins(:changeset).where("#{Changeset.table_name}.repository_id = ?", id).select("committer, user_id, count(*) as count").group("committer, user_id") - + changes = Change.joins(:changeset).where("#{Changeset.table_name}.repository_id = ?", id). + select("committer, user_id, count(*) as count").group("committer, user_id") user_ids = changesets.map(&:user_id).compact.uniq authors_names = User.where(:id => user_ids).inject({}) do |memo, user| memo[user.id] = user.to_s memo end - (commits + changes).inject({}) do |hash, element| mapped_name = element.committer if username = authors_names[element.user_id.to_i] -- 2.39.5