summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMrYummy <elemental428@gmail.com>2017-07-02 21:13:43 -0400
committerGitHub <noreply@github.com>2017-07-02 21:13:43 -0400
commitfcdcbe2514b0d1c95ba653e44321bdd41cdf4d32 (patch)
treed22030a1a4b745f3594576e136754e4debce8f0b
parent496e08393a5cc737fc82931fcb41aed53d61dfe7 (diff)
fixed issue with ?staff
-rw-r--r--app/models/user.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 3743136..07a02ea 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -178,7 +178,9 @@ class User < ActiveRecord::Base
def self.search (search, role, badge, staff)
users = User.joins(:role)
if role
- users = staff ? users.where("roles.value >= ?", Role.get(:mod).to_i) : users.where(role: role)
+ users = users.where(role: role)
+ elsif staff
+ users.where("roles.value >= ?", Role.get(:mod).to_i)
end
users = users.where(badge: badge) if badge
if search