diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-02-13 01:58:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-13 01:58:26 +0100 |
| commit | 62404668664e3349d87484f73b802f83efccbafa (patch) | |
| tree | 1d998e63e5592344262d76aec969f00368a0fe74 /app | |
| parent | f76dd51aa5dadc1799a1e6bd178247069d5acceb (diff) | |
Fix duplicate accounts when searching by IP range in admin UI (#17524)
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/account_filter.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account_filter.rb b/app/models/account_filter.rb index dcb1741227d..86b7f5f4174 100644 --- a/app/models/account_filter.rb +++ b/app/models/account_filter.rb @@ -49,7 +49,7 @@ class AccountFilter when 'email' accounts_with_users.merge(User.matches_email(value)) when 'ip' - valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value)) : Account.none + valid_ip?(value) ? accounts_with_users.merge(User.matches_ip(value).group('users.id, accounts.id')) : Account.none when 'invited_by' invited_by_scope(value) when 'order' diff --git a/app/models/user.rb b/app/models/user.rb index a11bc382489..fd1d7049a9c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -111,7 +111,7 @@ class User < ApplicationRecord scope :inactive, -> { where(arel_table[:current_sign_in_at].lt(ACTIVE_DURATION.ago)) } scope :active, -> { confirmed.where(arel_table[:current_sign_in_at].gteq(ACTIVE_DURATION.ago)).joins(:account).where(accounts: { suspended_at: nil }) } scope :matches_email, ->(value) { where(arel_table[:email].matches("#{value}%")) } - scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value) } + scope :matches_ip, ->(value) { left_joins(:ips).where('user_ips.ip <<= ?', value).group('users.id') } scope :emailable, -> { confirmed.enabled.joins(:account).merge(Account.searchable) } before_validation :sanitize_languages |