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

Fix suspended scope 

:non_suspended should check if suspension is <= NOW, else one could end up in neither group.
This commit is contained in:
Knut Aldrin Wikström 2014-05-15 15:47:49 +02:00
parent 986e8f2f0f
commit 579f2bf7b8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -88,7 +88,7 @@ class User < ActiveRecord::Base
scope :blocked, -> { where(blocked: true) } # no index scope :blocked, -> { where(blocked: true) } # no index
scope :not_blocked, -> { where(blocked: false) } # no index scope :not_blocked, -> { where(blocked: false) } # no index
scope :suspended, -> { where('suspended_till IS NOT NULL AND suspended_till > ?', Time.zone.now) } # no index scope :suspended, -> { where('suspended_till IS NOT NULL AND suspended_till > ?', Time.zone.now) } # no index
scope :not_suspended, -> { where('suspended_till IS NULL') } scope :not_suspended, -> { where('suspended_till IS NULL OR suspended_till <= ?', Time.zone.now) }
# excluding fake users like the community user # excluding fake users like the community user
scope :real, -> { where('id > 0') } scope :real, -> { where('id > 0') }