From e3f82140d8fa7f7e01378ccd5dcad57a96f2909b Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 27 Apr 2017 08:42:01 +0530 Subject: [PATCH] more readable code for filtering username/email when bulk adding to group --- app/controllers/admin/groups_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index b4cdd57eac8..ed4de972882 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -30,9 +30,9 @@ class Admin::GroupsController < Admin::AdminController valid_emails = {} valid_usernames = {} valid_users = User.where("username_lower IN (:users) OR email IN (:users)", users: users).pluck(:id, :username_lower, :email) - valid_users.each do |vu| - valid_emails[vu[1]] = valid_usernames[vu[2]] = vu[0] - vu.slice!(1..2) + valid_users.map! do |id, username_lower, email| + valid_emails[email] = valid_usernames[username_lower] = id + id end invalid_users = users.reject! { |u| valid_emails[u] || valid_usernames[u] } valid_users.flatten!