second try: fix mysql problem (not all users found)

dfe5ffd4 · Roger Rüttimann · Roger Meier · 54a918d9 · dfe5ffd4
Commit dfe5ffd4 authored Feb 06, 2019 by Roger Rüttimann Committed by Roger Meier Jun 13, 2019
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

app/models/user.rb app/models/user.rb +2 -2

No files found.
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -728,8 +728,8 @@ class User < ApplicationRecord
  end

  def expanded_groups_requiring_two_factor_authentication
-    Group.from_union([all_expanded_groups.where(require_two_factor_authentication: true),
-                      authorized_groups.where(require_two_factor_authentication: true)])
+    all_expanded_groups.where(require_two_factor_authentication: true).merge(
+      authorized_groups.where(require_two_factor_authentication: true))
  end

  # rubocop: disable CodeReuse/ServiceClass