From 6aee102114b35c5844ad53b5037ac59e9e90bf8a Mon Sep 17 00:00:00 2001
From: Logan Fick <logaldeveloper@protonmail.com>
Date: Mon, 31 Jul 2017 15:41:37 -0400
Subject: Fixed list of donators link not including donorplus badge.

---
 app/controllers/users_controller.rb | 2 +-
 app/models/user.rb                  | 4 +++-
 app/views/statics/donate.html.erb   | 2 +-
 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 315b767..5efed4d 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 2ca7114..ce29832 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 <%= 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
-- 
cgit v1.2.3


From faeba0ec702e75ed9f88e9a7fddc8c73ffcf3e3a Mon Sep 17 00:00:00 2001
From: Logan Fick <logaldeveloper@protonmail.com>
Date: Mon, 31 Jul 2017 16:04:23 -0400
Subject: Fixed grammar error.

---
 app/views/statics/donate.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/statics/donate.html.erb b/app/views/statics/donate.html.erb
index ce29832..5111d0d 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(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>
-- 
cgit v1.2.3