Fixed list of donators link not including donorplus badge. #38
@ -10,7 +10,7 @@ class UsersController < ApplicationController
|
|||||||
role = Role.find_by(name: params[:role])
|
role = Role.find_by(name: params[:role])
|
||||||
badge = Badge.find_by(name: params[:badge])
|
badge = Badge.find_by(name: params[:badge])
|
||||||
|
|
||||||
@users = User.search(params[:search], role, badge, params.include?(:staff))
|
@users = User.search(params[:search], role, badge, params.include?(:staff), params.include?(:donor))
|
||||||
@count = @users.size
|
@count = @users.size
|
||||||
@users = @users.page(params[:page]).per(100)
|
@users = @users.page(params[:page]).per(100)
|
||||||
end
|
end
|
||||||
|
@ -175,12 +175,14 @@ class User < ActiveRecord::Base
|
|||||||
self.email_token ||= SecureRandom.hex(16)
|
self.email_token ||= SecureRandom.hex(16)
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.search (search, role, badge, staff)
|
def self.search (search, role, badge, staff, donor)
|
||||||
users = User.joins(:role)
|
users = User.joins(:role)
|
||||||
if role
|
if role
|
||||||
users = users.where(role: role)
|
users = users.where(role: role)
|
||||||
elsif staff
|
elsif staff
|
||||||
users = users.where("roles.value >= ?", Role.get(:mod).to_i)
|
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
|
end
|
||||||
users = users.where(badge: badge) if badge
|
users = users.where(badge: badge) if badge
|
||||||
if search
|
if search
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
<li>Donator+ ($20 or more)
|
<li>Donator+ ($20 or more)
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p>We also have <%= link_to "list of users who donated", users_path(badge: "donor") %> already!</p>
|
<p>We also have a <%= link_to "list of users who donated", users_path(donor: "") %> already!</p>
|
||||||
|
|
||||||
<h3>Perks for you</h3>
|
<h3>Perks for you</h3>
|
||||||
<p>For <i>Donator</i> and <i>Donator+</i></p>
|
<p>For <i>Donator</i> and <i>Donator+</i></p>
|
||||||
|
@ -14,6 +14,8 @@
|
|||||||
text = "All '#{params[:role]}' and '#{params[:badge]}' users"
|
text = "All '#{params[:role]}' and '#{params[:badge]}' users"
|
||||||
elsif params.include?(:staff)
|
elsif params.include?(:staff)
|
||||||
text = "All staff"
|
text = "All staff"
|
||||||
|
elsif params.include?(:donor)
|
||||||
|
text = "All donors"
|
||||||
else
|
else
|
||||||
text = "All users"
|
text = "All users"
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user