Merge branch 'master' into poll-shifts-search-officers

2017-09-11 00:07:12 +02:00
parent 3b4e80a34d 4ba232a165
commit dd02c83fa3
17 changed files with 117 additions and 54 deletions
--- a/app/controllers/admin/poll/booths_controller.rb
+++ b/app/controllers/admin/poll/booths_controller.rb
@@ -30,6 +30,11 @@ class Admin::Poll::BoothsController < Admin::BaseController
    end
  end

+  def available
+    @booths = Poll::Booth.available.order(name: :asc).page(params[:page])
+    render :index
+  end
+
  private

    def booth_params