Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove this chained user scope (#17029) 

This reverts one of the changes introduced just now in:

27d7b0c6de

I don't think we need this `activated_not_suspended_not_staged` scope
because we can just compose it ourselves via method chaining like
`User.activated.not_suspended.not_staged`.
This commit is contained in:
Blake Erickson 2022-06-07 15:21:42 -06:00 committed by GitHub
parent 27d7b0c6de
commit 3941bad075
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/user.rb
View File

@ -221,7 +221,6 @@ class User < ActiveRecord::Base
scope :not_suspended, -> { where('suspended_till IS NULL OR suspended_till <= ?', Time.zone.now) } scope :not_suspended, -> { where('suspended_till IS NULL OR suspended_till <= ?', Time.zone.now) }
scope :activated, -> { where(active: true) } scope :activated, -> { where(active: true) }
scope :not_staged, -> { where(staged: false) } scope :not_staged, -> { where(staged: false) }
scope :activated_not_suspended_not_staged, -> { self.activated.not_suspended.not_staged }
scope :filter_by_username, ->(filter) do scope :filter_by_username, ->(filter) do
if filter.is_a?(Array) if filter.is_a?(Array)