fixes conflicts with polls

2017-01-29 00:44:56 +01:00
parent 6c34599e1e 8dc188e4cd
commit ea701e9963
10 changed files with 185 additions and 73 deletions
--- a/app/controllers/officing/polls_controller.rb
+++ b/app/controllers/officing/polls_controller.rb
@@ -2,7 +2,7 @@ class Officing::PollsController < Officing::BaseController

  def index
    @polls = current_user.poll_officer? ? current_user.poll_officer.assigned_polls : []
-    @polls = @polls.select {|poll| poll.current?(1.day.ago)}
+    @polls = @polls.select {|poll| poll.current?(Time.current) || poll.current?(1.day.ago)}
  end

 end