From 37f20198dacccf82b71ee58297ad1ecf087e70d8 Mon Sep 17 00:00:00 2001 From: taitus Date: Wed, 10 Apr 2019 14:33:47 +0200 Subject: [PATCH] Add setting_name param to others calls to _setting_table partial In these cases "setting" is the value expected by the new helper method for everything to continue rendering in the usual way. Note: All the new calls to _setting_table partial will need add setting_name param. --- app/views/admin/settings/_configuration_settings_tab.html.erb | 2 +- app/views/admin/settings/_map_configuration_tab.html.erb | 2 +- app/views/admin/settings/_proposals_dashboard.html.erb | 2 +- .../admin/site_customization/content_blocks/index.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/admin/settings/_configuration_settings_tab.html.erb b/app/views/admin/settings/_configuration_settings_tab.html.erb index d2b552138..2018035ec 100644 --- a/app/views/admin/settings/_configuration_settings_tab.html.erb +++ b/app/views/admin/settings/_configuration_settings_tab.html.erb @@ -1,3 +1,3 @@

<%= t("admin.settings.index.title") %>

-<%= render "settings_table", settings: @configuration_settings %> +<%= render "settings_table", settings: @configuration_settings, setting_name: "setting" %> diff --git a/app/views/admin/settings/_map_configuration_tab.html.erb b/app/views/admin/settings/_map_configuration_tab.html.erb index 871739337..aa128575f 100644 --- a/app/views/admin/settings/_map_configuration_tab.html.erb +++ b/app/views/admin/settings/_map_configuration_tab.html.erb @@ -1,7 +1,7 @@ <% if feature?(:map) %>

<%= t("admin.settings.index.map.title") %>

- <%= render "settings_table", settings: @map_configuration_settings %> + <%= render "settings_table", settings: @map_configuration_settings, setting_name: "setting" %>

<%= t("admin.settings.index.map.help") %>

diff --git a/app/views/admin/settings/_proposals_dashboard.html.erb b/app/views/admin/settings/_proposals_dashboard.html.erb index da76e218e..a33c5eff7 100644 --- a/app/views/admin/settings/_proposals_dashboard.html.erb +++ b/app/views/admin/settings/_proposals_dashboard.html.erb @@ -1,3 +1,3 @@

<%= t("admin.settings.index.dashboard.title") %>

-<%= render "settings_table", settings: @proposals_settings %> +<%= render "settings_table", settings: @proposals_settings, setting_name: "setting" %> %> diff --git a/app/views/admin/site_customization/content_blocks/index.html.erb b/app/views/admin/site_customization/content_blocks/index.html.erb index 1172e7f8b..ddedef7b7 100644 --- a/app/views/admin/site_customization/content_blocks/index.html.erb +++ b/app/views/admin/site_customization/content_blocks/index.html.erb @@ -6,7 +6,7 @@

<%= t("admin.site_customization.content_blocks.index.title") %>

-<%= render "admin/settings/settings_table", settings: @html_settings %> +<%= render "admin/settings/settings_table", settings: @html_settings, setting_name: "setting" %>

<%= t("admin.site_customization.content_blocks.information") %>