From 7fa594e3e322084d27cdc6ede4a2be65e3c630e1 Mon Sep 17 00:00:00 2001 From: taitus Date: Tue, 26 Jan 2021 18:07:40 +0100 Subject: [PATCH] Rename sdg_related_list to related_sdg_list To maintain consistency with the current names in the database with fields: :related_sdg_type and :related_sdg_id --- .../related_list_selector_component.html.erb | 4 +-- .../admin/legislation/processes_controller.rb | 2 +- .../admin/poll/polls_controller.rb | 2 +- .../budgets/investments_controller.rb | 2 +- app/controllers/debates_controller.rb | 2 +- app/controllers/proposals_controller.rb | 2 +- .../sdg_management/relations_controller.rb | 2 +- app/models/concerns/sdg/relatable.rb | 4 +-- config/locales/en/activerecord.yml | 2 +- config/locales/es/activerecord.yml | 2 +- .../related_list_selector_component_spec.rb | 2 +- spec/models/sdg/relatable_spec.rb | 26 +++++++++---------- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/components/sdg/related_list_selector_component.html.erb b/app/components/sdg/related_list_selector_component.html.erb index 21902e425..3697bfa29 100644 --- a/app/components/sdg/related_list_selector_component.html.erb +++ b/app/components/sdg/related_list_selector_component.html.erb @@ -1,6 +1,6 @@
- <%= f.label :sdg_related_list %> + <%= f.label :related_sdg_list %>
    "> <% goals.each do |goal| %> @@ -10,7 +10,7 @@ <% end %>
- <%= f.text_field :sdg_related_list, + <%= f.text_field :related_sdg_list, class: "input", label: false, placeholder: t("sdg.related_list_selector.placeholder"), diff --git a/app/controllers/admin/legislation/processes_controller.rb b/app/controllers/admin/legislation/processes_controller.rb index 46144207d..39d636d57 100644 --- a/app/controllers/admin/legislation/processes_controller.rb +++ b/app/controllers/admin/legislation/processes_controller.rb @@ -69,7 +69,7 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll :custom_list, :background_color, :font_color, - :sdg_related_list, + :related_sdg_list, translation_params(::Legislation::Process), documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], image_attributes: image_attributes diff --git a/app/controllers/admin/poll/polls_controller.rb b/app/controllers/admin/poll/polls_controller.rb index 8bf2b75f7..b9e33ae60 100644 --- a/app/controllers/admin/poll/polls_controller.rb +++ b/app/controllers/admin/poll/polls_controller.rb @@ -76,7 +76,7 @@ class Admin::Poll::PollsController < Admin::Poll::BaseController end def poll_params - attributes = [:name, :starts_at, :ends_at, :geozone_restricted, :budget_id, :sdg_related_list, + attributes = [:name, :starts_at, :ends_at, :geozone_restricted, :budget_id, :related_sdg_list, geozone_ids: [], image_attributes: image_attributes] params.require(:poll).permit(*attributes, *report_attributes, translation_params(Poll)) diff --git a/app/controllers/budgets/investments_controller.rb b/app/controllers/budgets/investments_controller.rb index a876af8f6..19e7655db 100644 --- a/app/controllers/budgets/investments_controller.rb +++ b/app/controllers/budgets/investments_controller.rb @@ -133,7 +133,7 @@ module Budgets def investment_params attributes = [:heading_id, :tag_list, :organization_name, :location, - :terms_of_service, :skip_map, :sdg_related_list, + :terms_of_service, :skip_map, :related_sdg_list, image_attributes: image_attributes, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], map_location_attributes: [:latitude, :longitude, :zoom]] diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 89ef3d725..a71a5be7b 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -55,7 +55,7 @@ class DebatesController < ApplicationController private def debate_params - attributes = [:tag_list, :terms_of_service, :sdg_related_list] + attributes = [:tag_list, :terms_of_service, :related_sdg_list] params.require(:debate).permit(attributes, translation_params(Debate)) end diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 544a939cc..8b28e1f79 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -99,7 +99,7 @@ class ProposalsController < ApplicationController def proposal_params attributes = [:video_url, :responsible_name, :tag_list, :terms_of_service, - :geozone_id, :skip_map, :sdg_related_list, + :geozone_id, :skip_map, :related_sdg_list, image_attributes: image_attributes, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy], diff --git a/app/controllers/sdg_management/relations_controller.rb b/app/controllers/sdg_management/relations_controller.rb index b9aab6c23..ae6c9790e 100644 --- a/app/controllers/sdg_management/relations_controller.rb +++ b/app/controllers/sdg_management/relations_controller.rb @@ -21,7 +21,7 @@ class SDGManagement::RelationsController < SDGManagement::BaseController end def update - @record.sdg_related_list = params[@record.class.table_name.singularize][:sdg_related_list] + @record.related_sdg_list = params[@record.class.table_name.singularize][:related_sdg_list] redirect_to({ action: :index }, notice: update_notice) end diff --git a/app/models/concerns/sdg/relatable.rb b/app/models/concerns/sdg/relatable.rb index 1b1b8d4a4..63ce917ef 100644 --- a/app/models/concerns/sdg/relatable.rb +++ b/app/models/concerns/sdg/relatable.rb @@ -73,11 +73,11 @@ module SDG::Relatable sdg_targets.sort.map(&:code).join(", ") end - def sdg_related_list + def related_sdg_list related_sdgs.sort.map(&:code).join(", ") end - def sdg_related_list=(codes) + def related_sdg_list=(codes) target_codes, goal_codes = codes.tr(" ", "").split(",").partition { |code| code.include?(".") } local_targets_codes, global_targets_codes = target_codes.partition { |code| code.split(".")[2] } global_targets = global_targets_codes.map { |code| SDG::Target[code] } diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml index 912b42972..825386440 100644 --- a/config/locales/en/activerecord.yml +++ b/config/locales/en/activerecord.yml @@ -2,7 +2,7 @@ en: attributes: geozone_id: "Scope of operation" results_enabled: "Show results" - sdg_related_list: "Sustainable Development Goals and Targets" + related_sdg_list: "Sustainable Development Goals and Targets" stats_enabled: "Show stats" advanced_stats_enabled: "Show advanced stats" name: Name diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml index 1a4785fc0..b98bafcb2 100644 --- a/config/locales/es/activerecord.yml +++ b/config/locales/es/activerecord.yml @@ -2,7 +2,7 @@ es: attributes: geozone_id: "Ámbito de actuación" results_enabled: "Mostrar resultados" - sdg_related_list: "Objetivos de Desarrollo Sostenible y Metas" + related_sdg_list: "Objetivos de Desarrollo Sostenible y Metas" stats_enabled: "Mostrar estadísticas" advanced_stats_enabled: "Mostrar estadísticas avanzadas" name: Nombre diff --git a/spec/components/sdg/related_list_selector_component_spec.rb b/spec/components/sdg/related_list_selector_component_spec.rb index 38a2fe74e..266b7146a 100644 --- a/spec/components/sdg/related_list_selector_component_spec.rb +++ b/spec/components/sdg/related_list_selector_component_spec.rb @@ -26,7 +26,7 @@ describe SDG::RelatedListSelectorComponent, type: :component do expect(page).not_to have_css ".sdg-related-list-selector" end - it "renders sdg_related_list field" do + it "renders related_sdg_list field" do render_inline component expect(page).to have_css ".sdg-related-list-selector .input" diff --git a/spec/models/sdg/relatable_spec.rb b/spec/models/sdg/relatable_spec.rb index cb65618e9..20e716d43 100644 --- a/spec/models/sdg/relatable_spec.rb +++ b/spec/models/sdg/relatable_spec.rb @@ -99,13 +99,13 @@ describe SDG::Relatable do end end - describe "#sdg_related_list" do + describe "#related_sdg_list" do it "orders related list by code" do relatable.sdg_goals = [SDG::Goal[1], SDG::Goal[3], SDG::Goal[2]] local_targets = %w[2.2.2 2.2.1 3.1.1].map { |code| create(:sdg_local_target, code: code) } relatable.sdg_targets = [SDG::Target[2.2], SDG::Target[1.2], SDG::Target[2.1]] + local_targets - expect(relatable.sdg_related_list).to eq "1, 1.2, 2, 2.1, 2.2, 2.2.1, 2.2.2, 3, 3.1.1" + expect(relatable.related_sdg_list).to eq "1, 1.2, 2, 2.1, 2.2, 2.2.1, 2.2.2, 3, 3.1.1" end end @@ -120,56 +120,56 @@ describe SDG::Relatable do end end - describe "#sdg_related_list=" do + describe "#related_sdg_list=" do it "assigns a single goal" do - relatable.sdg_related_list = "1" + relatable.related_sdg_list = "1" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1]] end it "assigns a single target" do - relatable.sdg_related_list = "1.1" + relatable.related_sdg_list = "1.1" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1]] expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1]] end it "assigns a single local target" do - relatable.sdg_related_list = local_target.code + relatable.related_sdg_list = local_target.code expect(relatable.reload.sdg_goals).to match_array [local_target.goal] expect(relatable.reload.sdg_local_targets).to match_array [local_target] end it "assigns multiple targets" do - relatable.sdg_related_list = "1.1,2.3" + relatable.related_sdg_list = "1.1,2.3" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2]] expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1], SDG::Target[2.3]] end it "assigns multiple goals" do - relatable.sdg_related_list = "3,2,1" + relatable.related_sdg_list = "3,2,1" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2], SDG::Goal[3]] end it "assigns multiple local targets" do - relatable.sdg_related_list = "#{local_target.code}, #{another_local_target.code}" + relatable.related_sdg_list = "#{local_target.code}, #{another_local_target.code}" expect(relatable.reload.sdg_goals).to match_array [local_target.goal, another_local_target.goal] expect(relatable.reload.sdg_local_targets).to match_array [local_target, another_local_target] end it "ignores trailing spaces and spaces between commas" do - relatable.sdg_related_list = " 1.1, 2.3 " + relatable.related_sdg_list = " 1.1, 2.3 " expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], SDG::Goal[2]] expect(relatable.reload.sdg_targets).to match_array [SDG::Target[1.1], SDG::Target[2.3]] end it "assigns goals, targets and local_targets" do - relatable.sdg_related_list = "1.1,3,4,4.1,#{another_local_target.code}" + relatable.related_sdg_list = "1.1,3,4,4.1,#{another_local_target.code}" expect(relatable.reload.sdg_goals).to match_array [SDG::Goal[1], another_local_target.goal, SDG::Goal[3], SDG::Goal[4]] expect(relatable.reload.sdg_global_targets).to match_array [SDG::Target[1.1], SDG::Target[4.1]] @@ -177,10 +177,10 @@ describe SDG::Relatable do end it "touches the associated record" do - relatable.sdg_related_list = "1.1, 2.1, 2.2" + relatable.related_sdg_list = "1.1, 2.1, 2.2" travel(10.seconds) do - relatable.sdg_related_list = "1.1, 2.1, 2.2, 3.1" + relatable.related_sdg_list = "1.1, 2.1, 2.2, 3.1" expect(relatable.updated_at).to eq Time.current end