Merge pull request #38.

2017-10-12 18:20:46 -04:00
parent fd40ac82ff faeba0ec70
commit adf1966b97
4 changed files with 7 additions and 3 deletions
--- 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