Merge branch 'master' into admin-newsletter-emails

2018-02-14 16:07:13 +01:00
parent 20de8c81f7 8bec36500a
commit 24bca36639
35 changed files with 559 additions and 897 deletions
--- a/app/controllers/admin/budget_investments_controller.rb
+++ b/app/controllers/admin/budget_investments_controller.rb
@@ -101,7 +101,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
    end

    def load_investment
-      @investment = Budget::Investment.where(budget_id: @budget.id).find(params[:id])
+      @investment = Budget::Investment.by_budget(@budget).find(params[:id])
    end

    def load_admins