Merge branch 'master' into feature/3153

2019-02-15 16:25:50 +01:00
parent f1bb1ff8de caa4d2ae81
commit a0fb19f0b4
1259 changed files with 48644 additions and 16791 deletions
--- a/app/controllers/admin/poll/polls_controller.rb
+++ b/app/controllers/admin/poll/polls_controller.rb
@@ -7,6 +7,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController
  before_action :load_geozones, only: [:new, :create, :edit, :update]

  def index
+    @polls = Poll.order(starts_at: :desc)
  end

  def show
@@ -51,7 +52,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController
  end

  def booth_assignments
-    @polls = Poll.current_or_incoming
+    @polls = Poll.current
  end

  private