From 63f239d0b2347e8d62449dba04bdaf9e8b85a299 Mon Sep 17 00:00:00 2001
From: Rafael dos Santos Silva <xfalcox@gmail.com>
Date: Wed, 4 May 2022 14:07:22 -0300
Subject: [PATCH] FIX: Add email to admin user list when show_emails is enabled
 (#16636)

Fixes a regression on be519d2 where this case wasn't accounted for.

Reported at https://meta.discourse.org/t/-/226094
---
 lib/admin_user_index_query.rb                | 2 ++
 spec/requests/admin/users_controller_spec.rb | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index 604ffb1b00f..9ecbb8f19ad 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -69,6 +69,8 @@ class AdminUserIndexQuery
       query = query.includes(:user_stat)
     end
 
+    query = query.joins(:primary_email) if params[:show_emails] == "true"
+
     query
   end
 
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index b0a4e8c4a22..2ad2eef4eed 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -39,6 +39,11 @@ RSpec.describe Admin::UsersController do
         end.to change { UserHistory.where(action: UserHistory.actions[:check_email], acting_user_id: admin.id).count }.by(1)
         expect(response.status).to eq(200)
       end
+
+      it "can be ordered by emails" do
+        get "/admin/users/list.json", params: { show_emails: "true", order: "email" }
+        expect(response.status).to eq(200)
+      end
     end
   end