Merge branch 'master' into budget-emails

2017-01-15 18:58:20 +01:00
parent abd8cd2faf 3038e841e0
commit 537de8c46c
18 changed files with 245 additions and 16 deletions
--- a/app/controllers/budgets/investments_controller.rb
+++ b/app/controllers/budgets/investments_controller.rb
@@ -62,6 +62,10 @@ module Budgets
    def vote
      @investment.register_selection(current_user)
      load_investment_votes(@investment)
+      respond_to do |format|
+        format.html { redirect_to budget_investments_path(heading_id: @investment.heading.id) }
+        format.js
+      end
    end

    private