Merge branch 'master' into proposal-dashboard

2019-04-23 17:12:47 +02:00
parent 94b8caffca b230cd29ab
commit cb22e6cbfb
643 changed files with 2814 additions and 1417 deletions
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -11,8 +11,8 @@ class PollsController < ApplicationController
  ::Poll::Answer # trigger autoload

  def index
-    @polls = @polls.public_polls.send(@current_filter).includes(:geozones)
-                                .sort_for_list.page(params[:page])
+    @polls = @polls.not_budget.public_polls.send(@current_filter).includes(:geozones)
+                              .sort_for_list.page(params[:page])
  end

  def show