Merge branch 'master' into fix/shift_creation_polls

2017-10-04 15:27:54 +02:00
parent 2900104a07 9ab22870cc
commit e1a7fc5dfa
47 changed files with 304 additions and 446 deletions
--- a/app/controllers/admin/poll/shifts_controller.rb
+++ b/app/controllers/admin/poll/shifts_controller.rb
@@ -29,7 +29,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