Merge pull request #1978 from consul/officing_requested_changes

Officing requested changes
2017-10-04 14:20:36 +02:00
parent 05df996078 85695d51bb
commit 4e99012f8b
5 changed files with 7 additions and 7 deletions
--- a/app/controllers/admin/poll/shifts_controller.rb
+++ b/app/controllers/admin/poll/shifts_controller.rb
@@ -30,7 +30,7 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
  end

  def search_officers
-    @officers = User.search(params[:search]).order(username: :asc)
+    @officers = User.search(params[:search]).order(username: :asc).select { |o| o.poll_officer? == true }
  end

  private