Merge branch 'master' into 1647-locale_site_customization

app/controllers/admin/budget_investments_controller.rb

@@ -51,7 +51,7 @@ class Admin::BudgetInvestmentsController < Admin::BaseController
 
     def budget_investment_params
       params.require(:budget_investment)
-            .permit(:title, :description, :external_url, :heading_id, :administrator_id, :valuation_tag_list, valuator_ids: [])
+            .permit(:title, :description, :external_url, :heading_id, :administrator_id, :valuation_tag_list, :incompatible, valuator_ids: [])
     end
 
     def load_budget

app/controllers/budgets/results_controller.rb

@@ -5,7 +5,8 @@ module Budgets
 
     def show
       authorize! :read_results, @budget
-      @result = load_result
+      @investments = load_result.investments
+      @heading = heading
     end
 
     private
@@ -19,4 +20,4 @@ module Budgets
       end
 
   end
-end
+end

app/controllers/legislation/processes_controller.rb

@@ -83,7 +83,12 @@ class Legislation::ProcessesController < Legislation::BaseController
 
   private
 
+    def member_method?
+      params[:id].present?
+    end
+
     def set_process
+      return if member_method?
       @process = ::Legislation::Process.find(params[:process_id])
     end
 end