Merge pull request #38.

This commit is contained in:
Logan Fick
2017-10-12 18:20:46 -04:00
4 changed files with 7 additions and 3 deletions

View File

@@ -175,12 +175,14 @@ class User < ActiveRecord::Base
self.email_token ||= SecureRandom.hex(16)
end
def self.search (search, role, badge, staff)
def self.search (search, role, badge, staff, donor)
users = User.joins(:role)
if role
users = users.where(role: role)
elsif staff
users = users.where("roles.value >= ?", Role.get(:mod).to_i)
elsif donor
users = users.where("badge_id = ? OR badge_id = ?", Badge.get(:donor), Badge.get(:donorplus))
end
users = users.where(badge: badge) if badge
if search