From e00aa807b958e1a016676b07c3fbacf840627ead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Tue, 7 Mar 2023 18:10:33 +0100 Subject: [PATCH] Make remove marker label parameter optional We were passing `nil` in some calls, which was confusing. Since now we've got two optional parameters, we're using named parameters. --- app/components/budgets/map_component.html.erb | 2 +- app/components/shared/map_location_component.rb | 2 +- app/views/budgets/investments/_investment_detail.html.erb | 2 +- app/views/budgets/investments/_map.html.erb | 2 +- app/views/map_locations/_form_fields.html.erb | 2 +- app/views/proposals/_info.html.erb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/components/budgets/map_component.html.erb b/app/components/budgets/map_component.html.erb index b839defa3..f6f595b3b 100644 --- a/app/components/budgets/map_component.html.erb +++ b/app/components/budgets/map_component.html.erb @@ -1,4 +1,4 @@

<%= t("budgets.index.map") %>

- <%= render_map(nil, "budgets", nil, coordinates) %> + <%= render_map(nil, "budgets", investments_coordinates: coordinates) %>
diff --git a/app/components/shared/map_location_component.rb b/app/components/shared/map_location_component.rb index 9be1c86c0..693589541 100644 --- a/app/components/shared/map_location_component.rb +++ b/app/components/shared/map_location_component.rb @@ -2,7 +2,7 @@ class Shared::MapLocationComponent < ApplicationComponent attr_reader :parent_class, :remove_marker_label, :investments_coordinates delegate :map_location_input_id, to: :helpers - def initialize(map_location, parent_class, remove_marker_label, investments_coordinates = nil) + def initialize(map_location, parent_class, remove_marker_label: nil, investments_coordinates: nil) @map_location = map_location @parent_class = parent_class @remove_marker_label = remove_marker_label diff --git a/app/views/budgets/investments/_investment_detail.html.erb b/app/views/budgets/investments/_investment_detail.html.erb index 456aac402..7c758dcc3 100644 --- a/app/views/budgets/investments/_investment_detail.html.erb +++ b/app/views/budgets/investments/_investment_detail.html.erb @@ -28,7 +28,7 @@ <% if feature?(:map) && map_location_available?(@investment.map_location) %>
- <%= render_map(investment.map_location, "budget_investment", nil) %> + <%= render_map(investment.map_location, "budget_investment") %>
<% end %> diff --git a/app/views/budgets/investments/_map.html.erb b/app/views/budgets/investments/_map.html.erb index 085e4fe90..cc549a90e 100644 --- a/app/views/budgets/investments/_map.html.erb +++ b/app/views/budgets/investments/_map.html.erb @@ -1,3 +1,3 @@
- <%= render_map(@map_location, "budgets", nil, @investments_map_coordinates) %> + <%= render_map(@map_location, "budgets", investments_coordinates: @investments_map_coordinates) %>
diff --git a/app/views/map_locations/_form_fields.html.erb b/app/views/map_locations/_form_fields.html.erb index 07c0fba17..4a26a5758 100644 --- a/app/views/map_locations/_form_fields.html.erb +++ b/app/views/map_locations/_form_fields.html.erb @@ -1,7 +1,7 @@ <%= form.label :map_location, label %>

<%= help %>

-<%= render_map(map_location, parent_class, remove_marker_label) %> +<%= render_map(map_location, parent_class, remove_marker_label: remove_marker_label) %> <%= form.fields_for :map_location, map_location do |m_l_fields| %> <%= m_l_fields.hidden_field :latitude, diff --git a/app/views/proposals/_info.html.erb b/app/views/proposals/_info.html.erb index 686e8dfa1..b5a5ebe79 100644 --- a/app/views/proposals/_info.html.erb +++ b/app/views/proposals/_info.html.erb @@ -42,7 +42,7 @@ <% if feature?(:map) && map_location_available?(@proposal.map_location) %>
- <%= render_map(@proposal.map_location, "proposal", nil) %> + <%= render_map(@proposal.map_location, "proposal") %>
<% end %>