Merge branch 'master' into content_blocks_for_headings

2018-12-11 16:40:25 +01:00
parent 9f455b9165 9aab3ddd7b
commit 6aa54d6c62
181 changed files with 1635 additions and 830 deletions
--- a/app/controllers/admin/budget_headings_controller.rb
+++ b/app/controllers/admin/budget_headings_controller.rb
@@ -33,7 +33,7 @@ class Admin::BudgetHeadingsController < Admin::BaseController
  private

    def budget_heading_params
-      params.require(:budget_heading).permit(:name, :price, :population, :allow_custom_content)
+      params.require(:budget_heading).permit(:name, :price, :population, :allow_custom_content, :latitude, :longitude)
    end

 end