fix Hound violations

This commit is contained in:
Julian Herrero
2018-12-19 16:17:33 +01:00
parent d2b3943968
commit 2081269a67
12 changed files with 66 additions and 32 deletions

View File

@@ -62,7 +62,8 @@ class Admin::BudgetHeadingsController < Admin::BaseController
end
def budget_heading_params
params.require(:budget_heading).permit(:name, :price, :population, :allow_custom_content, :latitude, :longitude)
params.require(:budget_heading).permit(:name, :price, :population, :allow_custom_content,
:latitude, :longitude)
end
end

View File

@@ -1,6 +1,10 @@
class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomization::BaseController
load_and_authorize_resource :content_block, class: "SiteCustomization::ContentBlock",
except: [:delete_heading_content_block, :edit_heading_content_block, :update_heading_content_block]
except: [
:delete_heading_content_block,
:edit_heading_content_block,
:update_heading_content_block
]
def index
@content_blocks = SiteCustomization::ContentBlock.order(:name, :locale)
@@ -27,7 +31,11 @@ class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomizati
end
def edit
@selected_content_block = (@content_block.is_a? SiteCustomization::ContentBlock) ? @content_block.name : "hcb_#{ @content_block.heading_id }"
if @content_block.is_a? SiteCustomization::ContentBlock
@selected_content_block = @content_block.name
else
@selected_content_block = "hcb_#{@content_block.heading_id}"
end
end
def update
@@ -65,7 +73,11 @@ class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomizati
def edit_heading_content_block
@content_block = Budget::ContentBlock.find(params[:id])
@selected_content_block = (@content_block.is_a? Budget::ContentBlock) ? "hcb_#{ @content_block.heading_id }" : @content_block.heading.name
if @content_block.is_a? Budget::ContentBlock
@selected_content_block = "hcb_#{@content_block.heading_id}"
else
@selected_content_block = @content_block.heading.name
end
@is_heading_content_block = true
render :edit
end
@@ -116,7 +128,8 @@ class Admin::SiteCustomization::ContentBlocksController < Admin::SiteCustomizati
heading_content_block = Budget::ContentBlock.new
heading_content_block.body = params[:site_customization_content_block][:body]
heading_content_block.locale = params[:site_customization_content_block][:locale]
heading_content_block.heading_id = params[:site_customization_content_block][:name].sub('hcb_', '').to_i
block_heading_id = params[:site_customization_content_block][:name].sub('hcb_', '').to_i
heading_content_block.heading_id = block_heading_id
heading_content_block
end
end

View File

@@ -78,7 +78,9 @@ module Budgets
def load_map
@investments ||= []
@investments_map_coordinates = MapLocation.where(investment: @investments).map(&:json_data)
@investments_map_coordinates = MapLocation.where(investment: @investments).map do |loc|
loc.json_data
end
@map_location = MapLocation.load_from_heading(@heading)
end

View File

@@ -43,7 +43,9 @@ module Budgets
@investments = all_investments.page(params[:page]).per(10).for_render
@investment_ids = @investments.pluck(:id)
@investments_map_coordinates = MapLocation.where(investment_id: all_investments).map { |l| l.json_data }
@investments_map_coordinates = MapLocation.where(investment: all_investments).map do |loc|
loc.json_data
end
load_investment_votes(@investments)
@tag_cloud = tag_cloud

View File

@@ -1,6 +1,8 @@
module ContentBlocksHelper
def valid_blocks
options = SiteCustomization::ContentBlock::VALID_BLOCKS.map { |key| [t("admin.site_customization.content_blocks.content_block.names.#{key}"), key] }
options = SiteCustomization::ContentBlock::VALID_BLOCKS.map do
|key| [t("admin.site_customization.content_blocks.content_block.names.#{key}"), key]
end
Budget::Heading.allow_custom_content.each do |heading|
options.push([heading.name, "hcb_#{heading.id}"])
end