diff options
| author | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-12 18:20:46 -0400 |
|---|---|---|
| committer | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-12 18:20:46 -0400 |
| commit | adf1966b97d6c5fb33e42656ca67d2adc0cad1d7 (patch) | |
| tree | f711f28bd6869d3b6997613a8a0e4f4e2f929e79 | |
| parent | fd40ac82ff501d6a0bd346d4503daded86213b4a (diff) | |
| parent | faeba0ec702e75ed9f88e9a7fddc8c73ffcf3e3a (diff) | |
Merge pull request #38.
| -rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 4 | ||||
| -rw-r--r-- | app/views/statics/donate.html.erb | 2 | ||||
| -rw-r--r-- | app/views/users/index.html.erb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5f2c892..5c55976 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -10,7 +10,7 @@ class UsersController < ApplicationController role = Role.find_by(name: params[:role]) 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 @users = @users.page(params[:page]).per(100) end diff --git a/app/models/user.rb b/app/models/user.rb index b996978..14364ed 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -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 diff --git a/app/views/statics/donate.html.erb b/app/views/statics/donate.html.erb index be6ec1c..8f82cde 100644 --- a/app/views/statics/donate.html.erb +++ b/app/views/statics/donate.html.erb @@ -11,7 +11,7 @@ <li>Donator+ ($20 or more) </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> <p>For <i>Donator</i> and <i>Donator+</i></p> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 74f65e5..a8888db 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -14,6 +14,8 @@ text = "All '#{params[:role]}' and '#{params[:badge]}' users" elsif params.include?(:staff) text = "All staff" + elsif params.include?(:donor) + text = "All donors" else text = "All users" end |