From 82c1728499341955e6bbbbd8220581fc6e5ce3cb Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Thu, 6 Nov 2025 16:12:46 +0100 Subject: [PATCH 01/45] fix: imporve accessibility on main_links_mobile_account --- .../header/_main_links_mobile_account.html.erb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb index f72ba2726225f..29a990ce40c21 100644 --- a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +++ b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb @@ -10,8 +10,9 @@
-
+
<%= icon "close-line" %> +

<%= t("close", scope: "decidim.shared.flag_modal") %>

@@ -37,3 +38,16 @@ + From b98d87f30fe42077d6da69bdcb2265d8183a66d1 Mon Sep 17 00:00:00 2001 From: stephanie rousset Date: Thu, 6 Nov 2025 16:37:14 +0100 Subject: [PATCH 02/45] fix: update typo --- .../layouts/decidim/header/_main_links_mobile_account.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb index 29a990ce40c21..d2625c46365dc 100644 --- a/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb +++ b/decidim-core/app/views/layouts/decidim/header/_main_links_mobile_account.html.erb @@ -10,7 +10,7 @@
-
+
<%= icon "close-line" %>

<%= t("close", scope: "decidim.shared.flag_modal") %>

From fb12017df033e04c97c2d4b7e6a5311ef780da1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Fri, 14 Nov 2025 12:36:33 +0100 Subject: [PATCH 03/45] Fix for process admins accessing some components (#15511) --- .../models/decidim/accountability/result.rb | 4 +-- .../spec/system/admin/admin_access_spec.rb | 14 ++++++++ ...ipatory_space_component_access_examples.rb | 36 +++++++++++++++++++ .../spec/system/admin_access_spec.rb | 14 ++++++++ .../app/models/decidim/budgets/project.rb | 4 +-- .../spec/system/admin_access_spec.rb | 30 ++++++++++++++++ .../spec/system/admin/admin_access_spec.rb | 14 ++++++++ .../spec/system/admin_access_spec.rb | 14 ++++++++ .../spec/system/admin/admin_access_spec.rb | 14 ++++++++ .../spec/system/admin/admin_access_spec.rb | 14 ++++++++ .../spec/system/admin_access_spec.rb | 22 ++++++++++++ .../spec/system/admin/admin_access_spec.rb | 14 ++++++++ .../spec/system/admin_access_spec.rb | 14 ++++++++ 13 files changed, 204 insertions(+), 4 deletions(-) create mode 100644 decidim-accountability/spec/system/admin/admin_access_spec.rb create mode 100644 decidim-admin/lib/decidim/admin/test/admin_participatory_space_component_access_examples.rb create mode 100644 decidim-blogs/spec/system/admin_access_spec.rb create mode 100644 decidim-budgets/spec/system/admin_access_spec.rb create mode 100644 decidim-collaborative_texts/spec/system/admin/admin_access_spec.rb create mode 100644 decidim-debates/spec/system/admin_access_spec.rb create mode 100644 decidim-elections/spec/system/admin/admin_access_spec.rb create mode 100644 decidim-meetings/spec/system/admin/admin_access_spec.rb create mode 100644 decidim-pages/spec/system/admin_access_spec.rb create mode 100644 decidim-proposals/spec/system/admin/admin_access_spec.rb create mode 100644 decidim-surveys/spec/system/admin_access_spec.rb diff --git a/decidim-accountability/app/models/decidim/accountability/result.rb b/decidim-accountability/app/models/decidim/accountability/result.rb index bc9c23dd74a53..5a70742441e0a 100644 --- a/decidim-accountability/app/models/decidim/accountability/result.rb +++ b/decidim-accountability/app/models/decidim/accountability/result.rb @@ -103,11 +103,11 @@ def self.ransackable_scopes(_auth_object = nil) ransacker_i18n_multi :search_text, [:title, :description] def self.ransackable_attributes(auth_object = nil) - base = %w(search_text title description) + base = %w(id_string id search_text title description) return base unless auth_object&.admin? - base + %w(id_string created_at id progress) + base + %w(created_at progress) end def self.ransackable_associations(auth_object = nil) diff --git a/decidim-accountability/spec/system/admin/admin_access_spec.rb b/decidim-accountability/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..d7483830881f2 --- /dev/null +++ b/decidim-accountability/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "accountability" } + let!(:result) { create(:result, component:) } + let(:title) { "Results" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-admin/lib/decidim/admin/test/admin_participatory_space_component_access_examples.rb b/decidim-admin/lib/decidim/admin/test/admin_participatory_space_component_access_examples.rb new file mode 100644 index 0000000000000..c0cabd000fd16 --- /dev/null +++ b/decidim-admin/lib/decidim/admin/test/admin_participatory_space_component_access_examples.rb @@ -0,0 +1,36 @@ +# frozen_string_literal: true + +shared_examples "accessing the component in a participatory space" do + context "when the user is a visitor" do + let(:user) { nil } + + it "shows the unauthenticated message" do + expect(page).to have_content "You need to log in or create an account before continuing." + end + end + + context "when the user is a normal user" do + let(:user) { create(:user, :confirmed, organization:) } + let(:unauthorized_path) { "/" } + + before do + login_as user, scope: :user + end + + it_behaves_like "a 404 page" do + let(:target_path) { manage_component_path(component) } + end + end + + context "when the user is a process admin" do + let(:user) { create(:process_admin, :confirmed, organization:, participatory_process:) } + + before do + login_as user, scope: :user + end + + it "access the index page" do + expect(page).to have_content(title) + end + end +end diff --git a/decidim-blogs/spec/system/admin_access_spec.rb b/decidim-blogs/spec/system/admin_access_spec.rb new file mode 100644 index 0000000000000..d650e04270380 --- /dev/null +++ b/decidim-blogs/spec/system/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "blogs" } + let!(:post) { create(:post, component:, title: { en: "Blog post title" }) } + let(:title) { "Posts" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb index 261f69af96f4b..9990eab6dddcb 100644 --- a/decidim-budgets/app/models/decidim/budgets/project.rb +++ b/decidim-budgets/app/models/decidim/budgets/project.rb @@ -151,11 +151,11 @@ def self.ransackable_scopes(_auth_object = nil) end def self.ransackable_attributes(auth_object = nil) - base = %w(search_text description title) + base = %w(id_string id search_text description title) return base unless auth_object&.admin? - base + %w(id_string id selected selected_at confirmed_orders_count) + base + %w(selected selected_at confirmed_orders_count) end def self.ransackable_associations(_auth_object = nil) diff --git a/decidim-budgets/spec/system/admin_access_spec.rb b/decidim-budgets/spec/system/admin_access_spec.rb new file mode 100644 index 0000000000000..cfe1575049135 --- /dev/null +++ b/decidim-budgets/spec/system/admin_access_spec.rb @@ -0,0 +1,30 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "budgets" } + let(:budget) { create(:budget, component:) } + let!(:project) { create(:project, budget:) } + let(:title) { "Budgets" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" + + describe "when accessing projects" do + context "when the user is a process admin" do + let(:user) { create(:process_admin, :confirmed, organization:, participatory_process:) } + + before do + login_as user, scope: :user + end + + it "access the projects' index page" do + click_on(translated(budget.title)) + expect(page).to have_content(translated(project.title)) + end + end + end +end diff --git a/decidim-collaborative_texts/spec/system/admin/admin_access_spec.rb b/decidim-collaborative_texts/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..495a021b7d502 --- /dev/null +++ b/decidim-collaborative_texts/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "collaborative_texts" } + let!(:document) { create(:collaborative_text_document, :published, component:) } + let(:title) { "Collaborative texts" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-debates/spec/system/admin_access_spec.rb b/decidim-debates/spec/system/admin_access_spec.rb new file mode 100644 index 0000000000000..edbffd3d01f50 --- /dev/null +++ b/decidim-debates/spec/system/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "debates" } + let!(:debate) { create(:debate, component:) } + let(:title) { "Debates" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-elections/spec/system/admin/admin_access_spec.rb b/decidim-elections/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..ce6e0ca70a8a0 --- /dev/null +++ b/decidim-elections/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "elections" } + let!(:election) { create(:election, :with_token_csv_census, :published, component:) } + let(:title) { "Elections" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-meetings/spec/system/admin/admin_access_spec.rb b/decidim-meetings/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..941331b8a24a5 --- /dev/null +++ b/decidim-meetings/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "meetings" } + let!(:meeting) { create(:meeting, :published, component:) } + let(:title) { "Meetings" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-pages/spec/system/admin_access_spec.rb b/decidim-pages/spec/system/admin_access_spec.rb new file mode 100644 index 0000000000000..66ff844bcb0d6 --- /dev/null +++ b/decidim-pages/spec/system/admin_access_spec.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "pages" } + let(:title) { "Edit page" } + + # This does not work for pages + # + # let!(:page) { create(:page, component:) } + # + # So, we need to do a workaround + before do + create(:page, component:) + end + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-proposals/spec/system/admin/admin_access_spec.rb b/decidim-proposals/spec/system/admin/admin_access_spec.rb new file mode 100644 index 0000000000000..83a6b2c22e02f --- /dev/null +++ b/decidim-proposals/spec/system/admin/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "proposals" } + let!(:proposal) { create(:proposal, :official, component:) } + let(:title) { "Proposals" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end diff --git a/decidim-surveys/spec/system/admin_access_spec.rb b/decidim-surveys/spec/system/admin_access_spec.rb new file mode 100644 index 0000000000000..194786c6e3cb0 --- /dev/null +++ b/decidim-surveys/spec/system/admin_access_spec.rb @@ -0,0 +1,14 @@ +# frozen_string_literal: true + +require "spec_helper" + +require "decidim/admin/test/admin_participatory_space_component_access_examples" + +describe "AdminAccess" do + let(:manifest_name) { "surveys" } + let!(:survey) { create(:survey, :published, :clean_after_publish, component:) } + let(:title) { "Surveys" } + + include_context "when managing a component as an admin" + include_examples "accessing the component in a participatory space" +end From e589efc291d432b935ae5983a69503340e09564c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Fri, 14 Nov 2025 15:31:10 +0100 Subject: [PATCH 04/45] Remove legacy images from ActiveStorage migration (#15490) --- ...ve_legacy_images_from_assemblies_module.rb | 8 +++++++ ...e_legacy_images_from_conferences_module.rb | 13 ++++++++++ ...5_remove_legacy_images_from_core_module.rb | 24 +++++++++++++++++++ ...emove_legacy_images_from_debates_module.rb | 7 ++++++ .../lib/decidim/api/debate_type.rb | 1 - .../spec/types/integration_schema_spec.rb | 3 --- ...e_legacy_images_from_initiatives_module.rb | 7 ++++++ ...ges_from_participatory_processes_module.rb | 9 +++++++ 8 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 decidim-assemblies/db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb create mode 100644 decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb create mode 100644 decidim-core/db/migrate/20251112132305_remove_legacy_images_from_core_module.rb create mode 100644 decidim-debates/db/migrate/20251114092453_remove_legacy_images_from_debates_module.rb create mode 100644 decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb create mode 100644 decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb diff --git a/decidim-assemblies/db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb b/decidim-assemblies/db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb new file mode 100644 index 0000000000000..4f16e1eabb44b --- /dev/null +++ b/decidim-assemblies/db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromAssembliesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_assemblies, :hero_image, :string + remove_column :decidim_assemblies, :banner_image, :string + end +end diff --git a/decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb b/decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb new file mode 100644 index 0000000000000..a920cc33a1df1 --- /dev/null +++ b/decidim-conferences/db/migrate/20251112114826_remove_legacy_images_from_conferences_module.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromConferencesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_conferences, :hero_image, :string + remove_column :decidim_conferences, :banner_image, :string + remove_column :decidim_conferences, :main_logo, :string + remove_column :decidim_conferences, :signature, :string + + remove_column :decidim_conference_speakers, :avatar, :string + remove_column :decidim_conferences_partners, :logo, :string + end +end diff --git a/decidim-core/db/migrate/20251112132305_remove_legacy_images_from_core_module.rb b/decidim-core/db/migrate/20251112132305_remove_legacy_images_from_core_module.rb new file mode 100644 index 0000000000000..53fa74ae4c6d1 --- /dev/null +++ b/decidim-core/db/migrate/20251112132305_remove_legacy_images_from_core_module.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromCoreModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_organizations, :logo, :string + remove_column :decidim_organizations, :official_img_footer, :string + remove_column :decidim_organizations, :favicon, :string + + remove_column :oauth_applications, :organization_logo, :string + + remove_column :decidim_authorizations, :verification_attachment, :string + + # The original decidim_attachments table creation was in decidim-participatory_processes + # at decidim-participatory_processes/db/migrate/20161116115156_create_attachments.rb + # + # We need to workaround this issue as when creating new application this table may not exist + # when this migration is run + remove_column :decidim_attachments, :file, :string if table_exists?(:decidim_attachments) + + remove_column :decidim_users, :avatar, :string + + remove_column :decidim_private_exports, :file, :string + end +end diff --git a/decidim-debates/db/migrate/20251114092453_remove_legacy_images_from_debates_module.rb b/decidim-debates/db/migrate/20251114092453_remove_legacy_images_from_debates_module.rb new file mode 100644 index 0000000000000..f53849baaad4a --- /dev/null +++ b/decidim-debates/db/migrate/20251114092453_remove_legacy_images_from_debates_module.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromDebatesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_debates_debates, :image, :string + end +end diff --git a/decidim-debates/lib/decidim/api/debate_type.rb b/decidim-debates/lib/decidim/api/debate_type.rb index 59dd2cec03e73..96b0618ad7cc1 100644 --- a/decidim-debates/lib/decidim/api/debate_type.rb +++ b/decidim-debates/lib/decidim/api/debate_type.rb @@ -21,7 +21,6 @@ class DebateType < Decidim::Api::Types::BaseObject field :description, Decidim::Core::TranslatedFieldType, "The description for this debate", null: true field :end_time, Decidim::Core::DateTimeType, "The end time for this debate", null: true field :id, GraphQL::Types::ID, "The internal ID for this debate", null: false - field :image, GraphQL::Types::String, "The image of this debate", null: true field :information_updates, Decidim::Core::TranslatedFieldType, "The information updates for this debate", null: true field :instructions, Decidim::Core::TranslatedFieldType, "The instructions for this debate", null: true field :last_comment_at, Decidim::Core::DateTimeType, "The last comment time for this debate", null: true diff --git a/decidim-debates/spec/types/integration_schema_spec.rb b/decidim-debates/spec/types/integration_schema_spec.rb index 1a1da4f307871..7a012b9420e25 100644 --- a/decidim-debates/spec/types/integration_schema_spec.rb +++ b/decidim-debates/spec/types/integration_schema_spec.rb @@ -33,7 +33,6 @@ followsCount hasComments id - image informationUpdates { translation(locale: "#{locale}") } @@ -94,7 +93,6 @@ "followsCount" => 3, "hasComments" => debate.comment_threads.size.positive?, "id" => debate.id.to_s, - "image" => nil, "informationUpdates" => { "translation" => debate.information_updates[locale] }, "instructions" => { "translation" => debate.instructions[locale] }, "lastCommentAt" => debate.last_comment_at.to_time.iso8601, @@ -179,7 +177,6 @@ followsCount hasComments id - image informationUpdates { translation(locale: "#{locale}") } diff --git a/decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb b/decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb new file mode 100644 index 0000000000000..3484b1f1d0ff1 --- /dev/null +++ b/decidim-initiatives/db/migrate/20251112114520_remove_legacy_images_from_initiatives_module.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromInitiativesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_initiatives_types, :banner_image, :string + end +end diff --git a/decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb b/decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb new file mode 100644 index 0000000000000..ba8b3f9571c27 --- /dev/null +++ b/decidim-participatory_processes/db/migrate/20251112113613_remove_legacy_images_from_participatory_processes_module.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class RemoveLegacyImagesFromParticipatoryProcessesModule < ActiveRecord::Migration[7.2] + def change + remove_column :decidim_participatory_processes, :hero_image, :string + + remove_column :decidim_participatory_process_groups, :hero_image, :string + end +end From f5b9ba4ba81afbc3d4f8dba83503232e39774d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Fri, 14 Nov 2025 23:51:13 +0100 Subject: [PATCH 05/45] Fix links in footer when using the organizations' description (#15536) --- decidim-core/app/packs/stylesheets/decidim/_footer.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/decidim-core/app/packs/stylesheets/decidim/_footer.scss b/decidim-core/app/packs/stylesheets/decidim/_footer.scss index a190230986dd0..b232b86de0ed3 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_footer.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_footer.scss @@ -4,6 +4,10 @@ footer { &__top { @apply hidden lg:flex flex-row gap-8 container py-10; + + .prose a { + @apply text-white; + } } &__down { From 6355b4f7e6576eab88d1a76f8f58f98a60218b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Sat, 15 Nov 2025 00:11:07 +0100 Subject: [PATCH 06/45] Use same card for Meeting always (#15535) --- .../cells/decidim/meetings/meeting_cell.rb | 7 +--- .../cells/decidim/meetings/meeting_s_cell.rb | 15 -------- .../decidim/meetings/meeting_s_cell_spec.rb | 34 ------------------- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb delete mode 100644 decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb diff --git a/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb b/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb index e9ae6a277f9b3..a6e47514c13cc 100644 --- a/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb +++ b/decidim-meetings/app/cells/decidim/meetings/meeting_cell.rb @@ -16,12 +16,7 @@ def show private def card_size - case @options[:size] - when :s - "decidim/meetings/meeting_s" - else - "decidim/meetings/meeting_l" - end + "decidim/meetings/meeting_l" end def resource_icon diff --git a/decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb b/decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb deleted file mode 100644 index cde9e16e665b8..0000000000000 --- a/decidim-meetings/app/cells/decidim/meetings/meeting_s_cell.rb +++ /dev/null @@ -1,15 +0,0 @@ -# frozen_string_literal: true - -module Decidim - module Meetings - # This cell renders the Search (:s) meeting card - # for a given instance of a Meeting - class MeetingSCell < Decidim::CardSCell - private - - def metadata_cell - "decidim/meetings/meeting_card_metadata" - end - end - end -end diff --git a/decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb b/decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb deleted file mode 100644 index dcad111f0bb46..0000000000000 --- a/decidim-meetings/spec/cells/decidim/meetings/meeting_s_cell_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: true - -require "spec_helper" - -module Decidim::Meetings - describe MeetingSCell, type: :cell do - controller Decidim::Meetings::MeetingsController - - subject { my_cell.call } - - let!(:meeting) { create(:meeting, :published) } - let(:my_cell) { cell("decidim/meetings/meeting_s", meeting) } - - context "when rendering" do - it "renders the card" do - expect(subject).to have_css("div#meeting_#{meeting.id}") - end - end - - context "when title contains special html entities" do - let!(:original_title) { meeting.title["en"] } - - before do - meeting.update!(title: { en: "#{original_title} &'<" }) - meeting.reload - end - - it "escapes them correctly" do - title = decidim_html_escape(original_title).gsub(""", '"') - expect(subject.to_s).to include("<strong>#{title}</strong> &'<") - end - end - end -end From 3f63a073a294d16de8988551e21d16f482e8090d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Verg=C3=A9s?= Date: Sun, 16 Nov 2025 00:22:05 +0100 Subject: [PATCH 07/45] Fix duplicated participatory spaces in open data exports (#15459) --- .../decidim/assemblies/participatory_space.rb | 6 ++---- .../conferences/participatory_space.rb | 6 ++---- .../services/decidim/open_data_exporter.rb | 3 ++- .../decidim/open_data_exporter_spec.rb | 19 +++++++++++++++++-- .../initiatives/participatory_space.rb | 4 ++-- .../participatory_space.rb | 4 ++-- 6 files changed, 27 insertions(+), 15 deletions(-) diff --git a/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb b/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb index 9a990ce36c0d6..140a4ea33bec8 100644 --- a/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb +++ b/decidim-assemblies/lib/decidim/assemblies/participatory_space.rb @@ -46,10 +46,8 @@ end participatory_space.exports :assemblies do |export| - export.collection do - Decidim::Assembly - .public_spaces - .includes(:attachment_collections) + export.collection do |participatory_space, _user| + Decidim::Assembly.public_spaces.includes(:attachment_collections).where(id: participatory_space) end export.include_in_open_data = true diff --git a/decidim-conferences/lib/decidim/conferences/participatory_space.rb b/decidim-conferences/lib/decidim/conferences/participatory_space.rb index eed900f6c2319..b2cd8e49fced6 100644 --- a/decidim-conferences/lib/decidim/conferences/participatory_space.rb +++ b/decidim-conferences/lib/decidim/conferences/participatory_space.rb @@ -51,10 +51,8 @@ end participatory_space.exports :conferences do |export| - export.collection do - Decidim::Conference - .public_spaces - .includes(:taxonomies, :attachment_collections) + export.collection do |participatory_space, _user| + Decidim::Conference.public_spaces.includes(:taxonomies, :attachment_collections).where(id: participatory_space) end export.include_in_open_data = true diff --git a/decidim-core/app/services/decidim/open_data_exporter.rb b/decidim-core/app/services/decidim/open_data_exporter.rb index 57956d2ebeb8f..a3de4000dd62a 100644 --- a/decidim-core/app/services/decidim/open_data_exporter.rb +++ b/decidim-core/app/services/decidim/open_data_exporter.rb @@ -117,9 +117,10 @@ def data_for_component(export_manifest, col_sep = Decidim.default_csv_col_sep) end def data_for_participatory_space(export_manifest) - collection = participatory_spaces.flat_map do |participatory_space| + collection = participatory_spaces.filter { |space| space.manifest.name == export_manifest.manifest.name }.flat_map do |participatory_space| export_manifest.collection.call(participatory_space) end + serializer = export_manifest.open_data_serializer.nil? ? export_manifest.serializer : export_manifest.open_data_serializer exporter = Decidim::Exporters::CSV.new(collection, serializer) get_help_definition(:spaces, exporter, export_manifest, collection.count) unless collection.empty? diff --git a/decidim-core/spec/services/decidim/open_data_exporter_spec.rb b/decidim-core/spec/services/decidim/open_data_exporter_spec.rb index bd1420b6889ab..1bf890aa5cd52 100644 --- a/decidim-core/spec/services/decidim/open_data_exporter_spec.rb +++ b/decidim-core/spec/services/decidim/open_data_exporter_spec.rb @@ -162,6 +162,8 @@ let!(:participatory_process) { create(:participatory_process, :published, organization:) } let!(:assembly) { create(:assembly, :published, organization:) } + let!(:another_tenant_process) { create(:participatory_process, :published) } + before do subject.export end @@ -179,6 +181,19 @@ end end + it "includes only one reference por participatory space" do + csv_data = zip_contents.glob("*open-data-participatory_processes.csv").first.get_input_stream.read + expect(csv_data).to include(participatory_process.title["en"].gsub(/"/, '""')).once + csv_data = zip_contents.glob("*open-data-assemblies.csv").first.get_input_stream.read + expect(csv_data).to include(assembly.title["en"].gsub(/"/, '""')).once + end + + it "does not include data from other tenants" do + csv_data = zip_contents.glob("*open-data-participatory_processes.csv").first.get_input_stream.read + expect(csv_data).not_to include(another_tenant_process.title["en"].gsub(/"/, '""')) + expect(csv_data).to include(participatory_process.title["en"].gsub(/"/, '""')).once + end + describe "README content" do let(:file_data) { zip_contents.glob("README.md").first.get_input_stream.read } @@ -189,8 +204,8 @@ expect(file_data).to include("## results (1 resource)") expect(file_data).to include("## meetings (1 resource)") expect(file_data).to include("## meeting_comments (1 resource)") - expect(file_data).to include("## participatory_processes (30 resources)") - expect(file_data).to include("## assemblies (6 resources)") + expect(file_data).to include("## participatory_processes (5 resources)") + expect(file_data).to include("## assemblies (1 resource)") end it "does not have any missing translation" do diff --git a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb index 487945432d998..0d1ede4900c63 100644 --- a/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb +++ b/decidim-initiatives/lib/decidim/initiatives/participatory_space.rb @@ -57,8 +57,8 @@ ] participatory_space.exports :initiatives do |export| - export.collection do - Decidim::Initiative.public_spaces + export.collection do |participatory_space, _user| + Decidim::Initiative.public_spaces.where(id: participatory_space) end export.include_in_open_data = true diff --git a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb index 67e229f6df4af..43ae5ec4ae0d3 100644 --- a/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb +++ b/decidim-participatory_processes/lib/decidim/participatory_processes/participatory_space.rb @@ -42,8 +42,8 @@ end participatory_space.exports :participatory_processes do |export| - export.collection do - Decidim::ParticipatoryProcess.public_spaces + export.collection do |participatory_space, _user| + Decidim::ParticipatoryProcess.public_spaces.where(id: participatory_space) end export.include_in_open_data = true From aa9925387f4453811f2fb02a9ec2d79f50826eb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Sun, 16 Nov 2025 12:23:06 +0100 Subject: [PATCH 08/45] Fix reminder default value in legacy meetings (#15528) --- RELEASE_NOTES.md | 1 + ..._reminders_before_hours_for_legacy_meetings.rb | 15 +++++++++++++++ ...migrations.adoc => guide_data_migrations.adoc} | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb rename docs/modules/develop/pages/{guid_data_migrations.adoc => guide_data_migrations.adoc} (98%) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index ef4832300dbce..56e4168091602 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -37,6 +37,7 @@ bin/rails decidim:upgrade bin/rails db:migrate # skip this command if you have run it before: bin/rails decidim:upgrade:clean:remove_private_exports_attachments +bin/rails data:migrate ``` ### 1.4. AWS/Azure/Google Cloud assets storage diff --git a/decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb b/decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb new file mode 100644 index 0000000000000..d8945d02bdb1a --- /dev/null +++ b/decidim-meetings/db/data/20251114085753_change_send_reminders_before_hours_for_legacy_meetings.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class ChangeSendRemindersBeforeHoursForLegacyMeetings < ActiveRecord::Migration[7.2] + class Meeting < ApplicationRecord + self.table_name = "decidim_meetings_meetings" + end + + def up + Meeting.where(send_reminders_before_hours: nil).update_all(send_reminders_before_hours: 48) # rubocop:disable Rails/SkipsModelValidations + end + + def down + raise ActiveRecord::IrreversibleMigration + end +end diff --git a/docs/modules/develop/pages/guid_data_migrations.adoc b/docs/modules/develop/pages/guide_data_migrations.adoc similarity index 98% rename from docs/modules/develop/pages/guid_data_migrations.adoc rename to docs/modules/develop/pages/guide_data_migrations.adoc index c53b37b19f274..1e26e89090cc4 100644 --- a/docs/modules/develop/pages/guid_data_migrations.adoc +++ b/docs/modules/develop/pages/guide_data_migrations.adoc @@ -7,7 +7,7 @@ As the need to migrate data increased, we need a more reliable way to migrate da To run the data migrations, run the following command: ```console -bin/rails data:migrate:up +bin/rails data:migrate ``` To see the status of available data migrations, run the following command: From 8586215368bddc04538ac012626f1bb182323aba Mon Sep 17 00:00:00 2001 From: Alexandru Emil Lupu Date: Mon, 17 Nov 2025 11:49:45 +0200 Subject: [PATCH 09/45] Add missing i18n string in Conference program page (#15548) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Andrés Pereira de Lucena --- .../conferences/conference_program/_program_item.html.erb | 2 +- decidim-conferences/config/locales/en.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb index 7022ed6c91884..167021f6d636d 100644 --- a/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb @@ -11,7 +11,7 @@ <% categories.each do |category| %>
  • - <%= category.present? ? translated_attribute(category.name) : "other" %> + <%= category.present? ? translated_attribute(category.name) : t(".other_category") %>
    • <% end %> diff --git a/decidim-conferences/config/locales/en.yml b/decidim-conferences/config/locales/en.yml index 575c80ad18808..e79244eb9559f 100644 --- a/decidim-conferences/config/locales/en.yml +++ b/decidim-conferences/config/locales/en.yml @@ -443,6 +443,8 @@ en: no_slots_available: No slots available registration: Registration conference_program: + program_item: + other_category: Other show: program: Program conference_registration_mailer: From b6bb7a5adb2d2ea318a5d8c66d081fb1ead03f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Mon, 17 Nov 2025 10:50:52 +0100 Subject: [PATCH 10/45] Fix references for legacy UserGroups in Comments (#15509) --- ...117070404_update_user_groups_references.rb | 82 +++++++++++++++++++ .../update_user_groups_references_spec.rb | 80 ++++++++++++++++++ ...participatory_process_in_comments_spec.rb} | 0 3 files changed, 162 insertions(+) create mode 100644 decidim-comments/db/data/20251117070404_update_user_groups_references.rb create mode 100644 decidim-comments/spec/db/data/update_user_groups_references_spec.rb rename decidim-comments/spec/{tasks/decidim_comments_spec.rb => lib/tasks/decidim_comments_upgrade_participatory_process_in_comments_spec.rb} (100%) diff --git a/decidim-comments/db/data/20251117070404_update_user_groups_references.rb b/decidim-comments/db/data/20251117070404_update_user_groups_references.rb new file mode 100644 index 0000000000000..c336651e3c984 --- /dev/null +++ b/decidim-comments/db/data/20251117070404_update_user_groups_references.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +class UpdateUserGroupsReferences < ActiveRecord::Migration[7.2] + def up + Rails.logger.info "Starting comment body updates..." + + updated_count = 0 + skipped_count = 0 + error_count = 0 + + Decidim::Comments::Comment.find_each do |comment| + next if comment.body.blank? + + updated_body = process_comment_body(comment.body) + body_changed = updated_body != comment.body + + if body_changed + comment.update_column(:body, updated_body) # rubocop:disable Rails/SkipsModelValidations + updated_count += 1 + Rails.logger.info "✓ Updated comment ##{comment.id}" + else + skipped_count += 1 + end + rescue StandardError => e + error_count += 1 + Rails.logger.error "✗ Error updating comment ##{comment.id}: #{e.message}" + end + + log_summary(updated_count, skipped_count, error_count) + end + + def down + raise ActiveRecord::IrreversibleMigration + end + + private + + def process_comment_body(body) + updated_body = {} + + body.each do |locale, text| + updated_body[locale] = if locale == "machine_translations" && text.is_a?(Hash) + process_machine_translations(text) + else + replace_user_group_references(text) + end + end + + updated_body + end + + def process_machine_translations(translations) + updated_translations = {} + + translations.each do |translation_locale, translation_text| + next if translation_text.blank? + + updated_translations[translation_locale] = replace_user_group_references(translation_text) + end + + updated_translations + end + + def replace_user_group_references(text) + return text if text.blank? + + text.gsub( + %r{gid://([^/]+)/Decidim::UserGroup/(\d+)}, + 'gid://\1/Decidim::User/\2' + ) + end + + def log_summary(updated_count, skipped_count, error_count) + Rails.logger.info "=" * 50 + Rails.logger.info "Comment body update completed!" + Rails.logger.info "=" * 50 + Rails.logger.info "Updated: #{updated_count}" + Rails.logger.info "Skipped: #{skipped_count}" + Rails.logger.info "Errors: #{error_count}" + Rails.logger.info "=" * 50 + end +end diff --git a/decidim-comments/spec/db/data/update_user_groups_references_spec.rb b/decidim-comments/spec/db/data/update_user_groups_references_spec.rb new file mode 100644 index 0000000000000..cf628ac717327 --- /dev/null +++ b/decidim-comments/spec/db/data/update_user_groups_references_spec.rb @@ -0,0 +1,80 @@ +# frozen_string_literal: true + +require "spec_helper" +require "./db/data/20251117070404_update_user_groups_references" + +describe UpdateUserGroupsReferences do + let(:migrator) do + described_class.new.tap do |m| + m.verbose = false + end + end + + describe "#up" do + let!(:comment) { create(:comment, body:) } + + describe "with a normal body" do + let(:body) { { "en" => "This is a normal body" } } + let(:result) { { "en" => "This is a normal body" } } + + it "does not do anything" do + expect(comment.reload.body).to eq(body) + migrator.migrate(:up) + expect(comment.reload.body).to eq(result) + end + end + + describe "with a User reference in the body" do + let(:body) { { "en" => "This is a body mentioning gid://decidim-test/Decidim::User/9" } } + let(:result) { { "en" => "This is a body mentioning gid://decidim-test/Decidim::User/9" } } + + it "does not do anything" do + expect(comment.reload.body).to eq(body) + migrator.migrate(:up) + expect(comment.reload.body).to eq(result) + end + end + + describe "with a UserGroup reference in the body" do + let(:body) { { "en" => "This is a body mentioning gid://decidim-development-app/Decidim::UserGroup/5" } } + let(:result) { { "en" => "This is a body mentioning gid://decidim-development-app/Decidim::User/5" } } + + it "changes the reference to User" do + expect(comment.reload.body).to eq(body) + migrator.migrate(:up) + expect(comment.reload.body).to eq(result) + end + end + + describe "with a UserGroup reference in the body and machine translation enabled" do + let(:body) do + { + "en" => "This is a body mentioning gid://decidim-development-app/Decidim::UserGroup/5", + "machine_translations" => { + "es" => "Este es el cuerpo mencionando gid://decidim-development-app/Decidim::UserGroup/5" + } + } + end + let(:result) do + { + "en" => "This is a body mentioning gid://decidim-development-app/Decidim::User/5", + "machine_translations" => { + "es" => "Este es el cuerpo mencionando gid://decidim-development-app/Decidim::User/5" + } + } + end + + it "changes the reference to User" do + expect(comment.reload.body).to eq(body) + migrator.migrate(:up) + expect(comment.reload.body).to eq(result) + end + end + end + + describe "#down" do + it "raises IrreversibleMigration exception" do + expect { migrator.migrate(:down) }.to raise_error(ActiveRecord::IrreversibleMigration) + end + end +end diff --git a/decidim-comments/spec/tasks/decidim_comments_spec.rb b/decidim-comments/spec/lib/tasks/decidim_comments_upgrade_participatory_process_in_comments_spec.rb similarity index 100% rename from decidim-comments/spec/tasks/decidim_comments_spec.rb rename to decidim-comments/spec/lib/tasks/decidim_comments_upgrade_participatory_process_in_comments_spec.rb From e64961e0260547163fc9dc04488d115d29d6cf30 Mon Sep 17 00:00:00 2001 From: MariaDascaluPublicis <166501615+MariaDascaluPublicis@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:11:54 +0200 Subject: [PATCH 11/45] Fix table filter names disappear on hover in admin panel (#15199) Co-authored-by: Alexandru Emil Lupu --- .../decidim/admin/filterable_helper.rb | 2 +- .../controllers/dropdown/controller.js | 4 +-- .../packs/stylesheets/decidim/_dropdown.scss | 27 +++++++++++++++---- 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/decidim-admin/app/helpers/decidim/admin/filterable_helper.rb b/decidim-admin/app/helpers/decidim/admin/filterable_helper.rb index 5ca948ed86bd5..6d0daa36e8ef1 100644 --- a/decidim-admin/app/helpers/decidim/admin/filterable_helper.rb +++ b/decidim-admin/app/helpers/decidim/admin/filterable_helper.rb @@ -77,7 +77,7 @@ def dropdown_link(key, menu_id) safe_join([ content_tag(:span) { extract_html_value(key) }, icon("arrow-right-s-line", class: "fill-secondary absolute right-2"), - icon("arrow-right-s-line", class: "!fill-current !text-white absolute right-2") + icon("arrow-right-s-line", class: "fill-current text-white absolute right-2") ]) end end diff --git a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js index bcb15703d62a6..c5f012eaea871 100644 --- a/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js +++ b/decidim-core/app/packs/src/decidim/controllers/dropdown/controller.js @@ -116,10 +116,10 @@ export default class extends Controller { changeStyleOfSelectedElement() { this.element.addEventListener("click", function(event) { event.target.parentNode.parentNode.querySelectorAll("a").forEach((link) => { - link.parentNode.classList.remove("dropdown__item-hovered") + link.parentNode.classList.remove("dropdown__item-opened"); }) - event.target.parentNode.classList.add("dropdown__item-hovered") + event.target.parentNode.classList.add("dropdown__item-opened") }) } } diff --git a/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss b/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss index ff8e00402363d..ef6012059defe 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_dropdown.scss @@ -106,12 +106,9 @@ @apply text-gray-2 mr-1; } } - } - &:hover, - &-hovered { - > .dropdown__button { - @apply text-white no-underline; + &:hover { + @apply text-white no-underline !bg-secondary; span { @apply text-white; @@ -122,6 +119,26 @@ } } } + + &-opened { + > .dropdown__button { + @apply text-secondary no-underline; + + span { + @apply text-secondary; + } + + svg { + fill: rgb(var(--secondary-rgb) / var(--tw-bg-opacity)) !important; + } + + &:hover { + svg { + fill: white !important; + } + } + } + } } &__bottom { From dafd4954f769ff29c9684feaf6c1bde882171ed0 Mon Sep 17 00:00:00 2001 From: sdelcroix Date: Mon, 17 Nov 2025 12:18:26 +0100 Subject: [PATCH 12/45] Fix strong tags color in footer organization description (#15552) --- decidim-core/app/packs/stylesheets/decidim/_footer.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/decidim-core/app/packs/stylesheets/decidim/_footer.scss b/decidim-core/app/packs/stylesheets/decidim/_footer.scss index b232b86de0ed3..6fcf8478c0e4c 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_footer.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_footer.scss @@ -5,7 +5,8 @@ footer { &__top { @apply hidden lg:flex flex-row gap-8 container py-10; - .prose a { + .prose a, + .prose strong { @apply text-white; } } From ef14db97c3f42630b9abde884e581f1d14067900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Mon, 17 Nov 2025 12:19:07 +0100 Subject: [PATCH 13/45] Use taxonomies instead of categories for the conferences' program (#15533) --- .../decidim/conferences/_program.scss | 2 +- .../conference_program/_program_item.html.erb | 18 +++++++++--------- .../spec/system/conference_program_spec.rb | 8 ++++++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/decidim-conferences/app/packs/stylesheets/decidim/conferences/_program.scss b/decidim-conferences/app/packs/stylesheets/decidim/conferences/_program.scss index 4ec534831a1a4..3080beba9fcfd 100644 --- a/decidim-conferences/app/packs/stylesheets/decidim/conferences/_program.scss +++ b/decidim-conferences/app/packs/stylesheets/decidim/conferences/_program.scss @@ -13,7 +13,7 @@ @apply h-10 grid place-items-center border-b-2 border-tertiary text-center text-xl text-gray-2 font-semibold; } - &-category { + &-taxonomy { @apply h-10 w-full bg-background-4 border-b-2 border-secondary text-center text-secondary font-semibold text-md truncate leading-10; &-container { diff --git a/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb b/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb index 167021f6d636d..4add117864fa0 100644 --- a/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/conference_program/_program_item.html.erb @@ -4,23 +4,23 @@ <%= start_time.to_fs(:time) %> - <%= end_time.to_fs(:time) %>
    - <% categories = meetings.map(&:category).uniq %> + <% taxonomies = meetings.map(&:taxonomies).uniq %> <% seed = SecureRandom.hex(3).to_s %> - <% if categories.present? %> -
      - <% categories.each do |category| %> + <% if taxonomies.present? %> +
        + <% taxonomies.each do |taxonomy| %>
      • -
        - <%= category.present? ? translated_attribute(category.name) : t(".other_category") %> +
        + <%= taxonomy.first.present? ? translated_attribute(taxonomy.first.name) : t(".other_category") %>
        • <% end %>
      <% end %> - <% meetings.group_by(&:category).each do |categories_block| %> -
      - <% categories_block.last.each do |meeting| %> + <% meetings.group_by(&:taxonomies).each do |taxonomies_block| %> +
      + <% taxonomies_block.last.each do |meeting| %> <%= render partial: "program_meeting", locals: { meeting: } %> <% end %>
      diff --git a/decidim-conferences/spec/system/conference_program_spec.rb b/decidim-conferences/spec/system/conference_program_spec.rb index 6449c9c2e5b65..091136f369ee4 100644 --- a/decidim-conferences/spec/system/conference_program_spec.rb +++ b/decidim-conferences/spec/system/conference_program_spec.rb @@ -39,8 +39,10 @@ context "when there are some conference meetings" do let!(:conference_speakers) { create_list(:conference_speaker, 3, :with_meeting, conference:, meetings_component: component) } let(:meetings) { Decidim::ConferenceMeeting.where(component:) } + let(:taxonomy) { create(:taxonomy, parent: create(:taxonomy, organization:), organization:) } before do + meetings.each { |meeting| meeting.update(taxonomies: [taxonomy]) } visit decidim_conferences.conference_conference_program_path(conference, component) end @@ -79,5 +81,11 @@ end end end + + it "has the taxonomy name" do + within "[data-conference-program-day]" do + expect(page).to have_content(translated_attribute(taxonomy.name)) + end + end end end From 9a9ea17647db7e677b50e6323f1601a01ce15318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Pereira=20de=20Lucena?= Date: Mon, 17 Nov 2025 14:52:16 +0100 Subject: [PATCH 14/45] Make the admin tables a bit more consistent (#15271) --- .../decidim/accountability/admin/filterable.rb | 4 ---- .../accountability/admin/results/_result-tr.html.erb | 5 +---- .../admin/results/_results-thead.html.erb | 3 --- decidim-accountability/config/locales/en.yml | 1 - .../spec/shared/export_results_examples.rb | 2 +- ...min_filters_searches_and_paginates_results_spec.rb | 8 +------- .../spec/system/admin/admin_orders_results_spec.rb | 11 ----------- .../managed_users/impersonation_logs/index.html.erb | 6 +++--- .../decidim/admin/moderations/_moderation-tr.html.erb | 8 ++------ .../admin/moderations/_moderations-thead.html.erb | 1 - .../decidim/admin/moderations/reports/index.html.erb | 2 +- .../views/decidim/admin/newsletters/index.html.erb | 4 ++-- .../decidim/admin/test/manage_moderations_examples.rb | 6 +++--- .../concerns/decidim/budgets/admin/filterable.rb | 4 ---- .../budgets/admin/projects/_project-tr.html.erb | 3 --- .../budgets/admin/projects/_projects-thead.html.erb | 1 - decidim-budgets/config/locales/en.yml | 1 - .../spec/shared/export_projects_examples.rb | 2 +- ...in_filters_searches_and_paginates_projects_spec.rb | 8 +------- .../spec/system/admin_orders_projects_spec.rb | 11 ----------- .../admin/documents/_document-tr.html.erb | 4 +++- .../admin/conference_invites/index.html.erb | 2 +- .../decidim/debates/admin/debates/_debate-tr.html.erb | 4 ++-- .../elections/admin/elections/_election-tr.html.erb | 4 ++-- .../concerns/decidim/initiatives/admin/filterable.rb | 2 +- .../initiatives/admin/initiatives/index.html.erb | 2 -- decidim-initiatives/config/locales/en.yml | 3 +-- .../system/admin/admin_manages_initiatives_spec.rb | 6 ------ .../concerns/decidim/meetings/admin/filterable.rb | 4 ---- .../decidim/meetings/admin/invites/index.html.erb | 2 +- .../meetings/admin/meetings/_meeting-tr.html.erb | 7 ++----- .../meetings/admin/meetings/_meetings-thead.html.erb | 3 --- decidim-meetings/config/locales/en.yml | 1 - .../spec/shared/export_meetings_examples.rb | 2 +- .../spec/system/admin/filter_meetings_spec.rb | 8 +------- .../admin/participatory_process_steps/index.html.erb | 4 ++-- .../spec/shared/manage_process_steps_examples.rb | 4 ++-- .../concerns/decidim/proposals/admin/filterable.rb | 4 ---- decidim-proposals/config/locales/en.yml | 2 -- .../spec/shared/export_proposals_examples.rb | 2 +- .../spec/system/admin/filter_proposals_spec.rb | 8 +------- .../decidim/sortitions/admin/sortitions/show.html.erb | 2 +- .../admin/block_user_templates/index.html.erb | 2 +- .../admin/proposal_answer_templates/index.html.erb | 2 +- .../admin/questionnaire_templates/index.html.erb | 2 +- 45 files changed, 41 insertions(+), 136 deletions(-) diff --git a/decidim-accountability/app/controllers/concerns/decidim/accountability/admin/filterable.rb b/decidim-accountability/app/controllers/concerns/decidim/accountability/admin/filterable.rb index 7c47e726ab808..d81e1646cb74e 100644 --- a/decidim-accountability/app/controllers/concerns/decidim/accountability/admin/filterable.rb +++ b/decidim-accountability/app/controllers/concerns/decidim/accountability/admin/filterable.rb @@ -23,10 +23,6 @@ def base_query collection.includes(:taxonomies).joins(:taxonomies) end - def search_field_predicate - :id_string_or_title_cont - end - def filters [ :taxonomies_part_of_contains, diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_result-tr.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_result-tr.html.erb index cdc78857a54f5..5f0cc05983a4f 100644 --- a/decidim-accountability/app/views/decidim/accountability/admin/results/_result-tr.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/admin/results/_result-tr.html.erb @@ -2,9 +2,6 @@ <%= check_box_tag "result_ids_s[]", result.id, false, data: { result_id: result.id, result_checkbox: true } %>
      - "> - <%= result.id %>
      - "> <% if result.parent_id.nil? %> <%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %>
      @@ -21,7 +18,7 @@ <% end %> "> - <%= result.progress&.to_i %> + <%= result.progress.nil? ? 0 : result.progress&.to_i %>% "> <%= l result.created_at, format: :decidim_short %> diff --git a/decidim-accountability/app/views/decidim/accountability/admin/results/_results-thead.html.erb b/decidim-accountability/app/views/decidim/accountability/admin/results/_results-thead.html.erb index 783cd2bf6e5b9..1be892827d343 100644 --- a/decidim-accountability/app/views/decidim/accountability/admin/results/_results-thead.html.erb +++ b/decidim-accountability/app/views/decidim/accountability/admin/results/_results-thead.html.erb @@ -3,9 +3,6 @@ <%= check_box_tag "results_bulk", "all", false, data: { "select-all" => true } %> - - <%= sort_link(query, :id, t("models.result.fields.id", scope: "decidim.accountability"), default_order: :desc ) %> - <%= sort_link(query, :title, t("models.result.fields.title", scope: "decidim.accountability")) %> diff --git a/decidim-accountability/config/locales/en.yml b/decidim-accountability/config/locales/en.yml index 6e794e4e3465c..7747dad28c196 100644 --- a/decidim-accountability/config/locales/en.yml +++ b/decidim-accountability/config/locales/en.yml @@ -256,7 +256,6 @@ en: fields: created_at: Created end_date: End date - id: ID progress: Progress start_date: Start date status: Status diff --git a/decidim-accountability/spec/shared/export_results_examples.rb b/decidim-accountability/spec/shared/export_results_examples.rb index 53e2dee8caaed..8868b7ee5a400 100644 --- a/decidim-accountability/spec/shared/export_results_examples.rb +++ b/decidim-accountability/spec/shared/export_results_examples.rb @@ -11,7 +11,7 @@ context "with query" do before do - fill_in "q[id_string_or_title_cont]", with: translated(results.last.title) + fill_in "q[title_cont]", with: translated(results.last.title) find("button[aria-label='Search']").click end diff --git a/decidim-accountability/spec/system/admin/admin_filters_searches_and_paginates_results_spec.rb b/decidim-accountability/spec/system/admin/admin_filters_searches_and_paginates_results_spec.rb index e08f3ca91dbb5..f3fb086244670 100644 --- a/decidim-accountability/spec/system/admin/admin_filters_searches_and_paginates_results_spec.rb +++ b/decidim-accountability/spec/system/admin/admin_filters_searches_and_paginates_results_spec.rb @@ -49,7 +49,7 @@ end end - context "when searching by ID or title" do + context "when searching by title" do let!(:result1) do create(:result, component: current_component, title: Decidim::Faker::Localized.localized { generate(:title) }) @@ -61,12 +61,6 @@ let!(:result1_title) { translated(result1.title) } let!(:result2_title) { translated(result2.title) } - it "can be searched by ID" do - search_by_text(result1.id) - - expect(page).to have_content(result1_title) - end - it "can be searched by title" do search_by_text(result2_title) diff --git a/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb b/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb index a7d5d98951445..dd566f9ea1e52 100644 --- a/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb +++ b/decidim-accountability/spec/system/admin/admin_orders_results_spec.rb @@ -23,17 +23,6 @@ include_context "when managing a component as an admin" - it "orders results by ID" do - ordered_results = results.sort_by(&:id).reverse - - click_on "ID" - rows = page.all("tbody tr") - - rows.each_with_index do |row, i| - expect(row).to have_text(translated(ordered_results[i].title)) - end - end - it "orders results by title" do ordered_results = results.sort_by { |result| translated(result.title) } diff --git a/decidim-admin/app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb index 479439f17157d..c1dfb56faae16 100644 --- a/decidim-admin/app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/managed_users/impersonation_logs/index.html.erb @@ -23,9 +23,9 @@ <%= impersonation_log.admin.name %> <%= impersonation_log.user.name %> <%= impersonation_log.reason %> - <%= impersonation_log.started_at ? l(impersonation_log.started_at, format: :long) : nil %> - <%= impersonation_log.ended_at ? l(impersonation_log.ended_at, format: :long) : nil %> - <%= impersonation_log.expired_at ? l(impersonation_log.expired_at, format: :long) : nil %> + <%= impersonation_log.started_at ? l(impersonation_log.started_at, format: :decidim_short) : nil %> + <%= impersonation_log.ended_at ? l(impersonation_log.ended_at, format: :decidim_short) : nil %> + <%= impersonation_log.expired_at ? l(impersonation_log.expired_at, format: :decidim_short) : nil %> <% end %> diff --git a/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb b/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb index 8bfef9a49e5d6..8de7fb11b7196 100644 --- a/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb +++ b/decidim-admin/app/views/decidim/admin/moderations/_moderation-tr.html.erb @@ -3,10 +3,6 @@ <%= check_box_tag "moderation_ids_s[]", moderation.id, false, class: "js-check-all-moderations js-moderation-list-check js-moderation-id-#{moderation.id}" %> - "> - <%= moderation.reportable.id %> - - "> <%= moderation.reportable.class.model_name.human %> @@ -33,7 +29,7 @@ "> - <%= l moderation.created_at, format: :long %> + <%= l moderation.created_at, format: :decidim_short %> "> @@ -42,7 +38,7 @@ <% if params[:hidden] %> "> - <%= l(moderation.hidden_at, format: :long) if moderation.hidden_at.present? %> + <%= l(moderation.hidden_at, format: :decidim_short) if moderation.hidden_at.present? %> <% end %> diff --git a/decidim-admin/app/views/decidim/admin/moderations/_moderations-thead.html.erb b/decidim-admin/app/views/decidim/admin/moderations/_moderations-thead.html.erb index 568aeac88e717..907b9163e1a52 100644 --- a/decidim-admin/app/views/decidim/admin/moderations/_moderations-thead.html.erb +++ b/decidim-admin/app/views/decidim/admin/moderations/_moderations-thead.html.erb @@ -1,7 +1,6 @@ <%= check_box_tag "moderations_bulk", "all", false, class: "js-check-all" %> - <%= t("models.moderation.fields.reportable_id", scope: "decidim.moderations") %> <%= t("models.moderation.fields.reportable_type", scope: "decidim.moderations") %> <% if !respond_to?(:current_participatory_space) %> <%= t("models.moderation.fields.participatory_space", scope: "decidim.moderations") %> diff --git a/decidim-admin/app/views/decidim/admin/moderations/reports/index.html.erb b/decidim-admin/app/views/decidim/admin/moderations/reports/index.html.erb index cf0f7b3d28cdf..8c6651b0f2f8d 100644 --- a/decidim-admin/app/views/decidim/admin/moderations/reports/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/moderations/reports/index.html.erb @@ -57,7 +57,7 @@
      <%= moderation.reportable.class.name.demodulize %>
      <%= t("models.moderation.fields.created_at", scope: "decidim.moderations") %>
      -
      <%= l(moderation.created_at, format: :long) %>
      +
      <%= l(moderation.created_at, format: :decidim_short) %>
      <%= t(".participatory_space") %>
      <%= translated_attribute moderation.participatory_space.title %>
      diff --git a/decidim-admin/app/views/decidim/admin/newsletters/index.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/index.html.erb index 68fad7f13a538..43076fccff295 100644 --- a/decidim-admin/app/views/decidim/admin/newsletters/index.html.erb +++ b/decidim-admin/app/views/decidim/admin/newsletters/index.html.erb @@ -36,11 +36,11 @@ "> - <%= l(newsletter.created_at, format: :long) if newsletter.created_at %> + <%= l(newsletter.created_at, format: :decidim_short) if newsletter.created_at %> "> - <%= l(newsletter.sent_at, format: :long) if newsletter.sent_at %> + <%= l(newsletter.sent_at, format: :decidim_short) if newsletter.sent_at %> "> diff --git a/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb index 7cd65a339c946..df037d030b7a0 100644 --- a/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb +++ b/decidim-admin/lib/decidim/admin/test/manage_moderations_examples.rb @@ -27,7 +27,7 @@ click_on link_text end all("tbody tr").each_with_index do |row, _index| - expect(row.find("td:nth-child(2)")).to have_content(reportables.first.id) + expect(row.find("td:nth-child(2)")).to have_content(reportables.first.class.model_name.human) end end end @@ -107,8 +107,8 @@ click_on "Reports count" all("tbody tr").each_with_index do |row, index| - reportable_id = moderations_ordered_by_report_count_asc[index].reportable.id - expect(row.find("td:nth-child(2)")).to have_content(reportable_id) + reportable_type = moderations_ordered_by_report_count_asc[index].reportable.class.model_name.human + expect(row.find("td:nth-child(2)")).to have_content(reportable_type) end end end diff --git a/decidim-budgets/app/controllers/concerns/decidim/budgets/admin/filterable.rb b/decidim-budgets/app/controllers/concerns/decidim/budgets/admin/filterable.rb index 3d191ae76fcee..fcb87792be20f 100644 --- a/decidim-budgets/app/controllers/concerns/decidim/budgets/admin/filterable.rb +++ b/decidim-budgets/app/controllers/concerns/decidim/budgets/admin/filterable.rb @@ -23,10 +23,6 @@ def base_query collection.includes(:taxonomies).joins(:taxonomies) end - def search_field_predicate - :id_string_or_title_cont - end - def filters [ :taxonomies_part_of_contains, diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb index eef9246f9f198..17faa519d2eed 100644 --- a/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb +++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_project-tr.html.erb @@ -2,9 +2,6 @@ <%= check_box_tag "project_ids_s[]", project.id, false, class: "js-check-all-resources js-project-list-check js-resource-id-#{project.id}" %>
      - "> - <%= project.id %>
      - "> <% if allowed_to? :update, :project, project: project %> <%= link_to translated_attribute(project.title), resource_locator([budget, project]).edit %>
      diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb index fe3bf57a8fcf5..8461708195b5c 100644 --- a/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb +++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/_projects-thead.html.erb @@ -1,7 +1,6 @@ <%= check_box_tag "projects_bulk", "all", false, class: "js-check-all" %> - <%= sort_link(query, :id, t("models.project.fields.id", scope: "decidim.budgets"), default_order: :desc) %> <%= sort_link(query, :title, t("models.project.fields.title", scope: "decidim.budgets")) %> <%= sort_link(query, :taxonomies_name, t("models.project.fields.taxonomies", scope: "decidim.budgets") ) %> <%= sort_link(query, :confirmed_orders_count, t("index.confirmed_orders_count")) %> diff --git a/decidim-budgets/config/locales/en.yml b/decidim-budgets/config/locales/en.yml index b3b16a2bd28d4..16e4075e8ac5a 100644 --- a/decidim-budgets/config/locales/en.yml +++ b/decidim-budgets/config/locales/en.yml @@ -214,7 +214,6 @@ en: total_budget: Total budget project: fields: - id: ID map: Map taxonomies: Taxonomies title: Title diff --git a/decidim-budgets/spec/shared/export_projects_examples.rb b/decidim-budgets/spec/shared/export_projects_examples.rb index db560c0120651..b90beff12d645 100644 --- a/decidim-budgets/spec/shared/export_projects_examples.rb +++ b/decidim-budgets/spec/shared/export_projects_examples.rb @@ -9,7 +9,7 @@ context "with query" do before do - fill_in "q[id_string_or_title_cont]", with: translated(projects.last.title) + fill_in "q[title_cont]", with: translated(projects.last.title) find("button[aria-label='Search']").click end diff --git a/decidim-budgets/spec/system/admin_filters_searches_and_paginates_projects_spec.rb b/decidim-budgets/spec/system/admin_filters_searches_and_paginates_projects_spec.rb index e231bcb189ee2..41c530fd8ff73 100644 --- a/decidim-budgets/spec/system/admin_filters_searches_and_paginates_projects_spec.rb +++ b/decidim-budgets/spec/system/admin_filters_searches_and_paginates_projects_spec.rb @@ -48,7 +48,7 @@ end end - context "when searching by ID or title" do + context "when searching by title" do let!(:project1) { create(:project, budget:) } let!(:project2) { create(:project, budget:) } let!(:project1_title) { translated(project1.title) } @@ -56,12 +56,6 @@ before { visit current_path } - it "can be searched by ID" do - search_by_text(project1.id) - - expect(page).to have_content(project1_title) - end - it "can be searched by title" do search_by_text(project2_title) diff --git a/decidim-budgets/spec/system/admin_orders_projects_spec.rb b/decidim-budgets/spec/system/admin_orders_projects_spec.rb index 1a6452e65ad5f..8a00466ceee77 100644 --- a/decidim-budgets/spec/system/admin_orders_projects_spec.rb +++ b/decidim-budgets/spec/system/admin_orders_projects_spec.rb @@ -35,17 +35,6 @@ end end - it "orders projects by ID" do - ordered_projects = projects.sort_by(&:id).reverse - - click_on "ID" - rows = page.all("tbody tr") - - rows.each_with_index do |row, i| - expect(row).to have_text(translated(ordered_projects[i].title)) - end - end - it "orders projects by title" do ordered_projects = projects.sort_by { |project| translated(project.title) } diff --git a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_document-tr.html.erb b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_document-tr.html.erb index 553697d150d7c..6f25fdeb117aa 100644 --- a/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_document-tr.html.erb +++ b/decidim-collaborative_texts/app/views/decidim/collaborative_texts/admin/documents/_document-tr.html.erb @@ -7,7 +7,9 @@ <% end %> "> - <%= t("booleans.#{document.accepting_suggestions}") %> + !text-sm"> + <%= humanize_boolean document.accepting_suggestions %> + "> <% if document.published? %> diff --git a/decidim-conferences/app/views/decidim/conferences/admin/conference_invites/index.html.erb b/decidim-conferences/app/views/decidim/conferences/admin/conference_invites/index.html.erb index 7edaa9bf90d90..1570a5a9721bf 100644 --- a/decidim-conferences/app/views/decidim/conferences/admin/conference_invites/index.html.erb +++ b/decidim-conferences/app/views/decidim/conferences/admin/conference_invites/index.html.erb @@ -33,7 +33,7 @@ <% if invite.sent_at %> - <%= l invite.sent_at, format: :long %> + <%= l invite.sent_at, format: :decidim_short %> <% end %> diff --git a/decidim-debates/app/views/decidim/debates/admin/debates/_debate-tr.html.erb b/decidim-debates/app/views/decidim/debates/admin/debates/_debate-tr.html.erb index 8ebde884813d5..06006e18d194d 100644 --- a/decidim-debates/app/views/decidim/debates/admin/debates/_debate-tr.html.erb +++ b/decidim-debates/app/views/decidim/debates/admin/debates/_debate-tr.html.erb @@ -8,12 +8,12 @@ "> <% if debate.start_time %> - <%= l debate.start_time, format: :long %> + <%= l debate.start_time, format: :decidim_short %> <% end %> "> <% if debate.end_time %> - <%= l debate.end_time, format: :long %> + <%= l debate.end_time, format: :decidim_short %> <% end %> "> diff --git a/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb b/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb index 33e27c637243f..b424a89655a2f 100644 --- a/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb +++ b/decidim-elections/app/views/decidim/elections/admin/elections/_election-tr.html.erb @@ -8,14 +8,14 @@ "> <% if election.start_at %> - <%= l election.start_at, format: :long %> + <%= l election.start_at, format: :decidim_short %> <% else %> <%= t("decidim.elections.admin.elections.form.manual_start") %> <% end %> "> <% if election.end_at %> - <%= l election.end_at, format: :long %> + <%= l election.end_at, format: :decidim_short %> <% end %> "> diff --git a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb index afe754f4f9f99..a79d068133eee 100644 --- a/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb +++ b/decidim-initiatives/app/controllers/concerns/decidim/initiatives/admin/filterable.rb @@ -18,7 +18,7 @@ def base_query end def search_field_predicate - :title_or_description_or_id_string_or_author_name_or_author_nickname_cont + :title_or_description_or_author_name_or_author_nickname_cont end def filters diff --git a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb index 19a54708fd59a..83c31bc92a853 100644 --- a/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb +++ b/decidim-initiatives/app/views/decidim/initiatives/admin/initiatives/index.html.erb @@ -19,7 +19,6 @@ - @@ -31,7 +30,6 @@ <% @initiatives.each do |initiative| %> - - - diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml index 951b3cc2ae536..caf2044628203 100644 --- a/decidim-meetings/config/locales/en.yml +++ b/decidim-meetings/config/locales/en.yml @@ -678,7 +678,6 @@ en: fields: closed: Closed end_time: End date - id: ID map: Map official_meeting: Official meeting published: Published diff --git a/decidim-meetings/spec/shared/export_meetings_examples.rb b/decidim-meetings/spec/shared/export_meetings_examples.rb index 53a909dceae1b..5464c858c0079 100644 --- a/decidim-meetings/spec/shared/export_meetings_examples.rb +++ b/decidim-meetings/spec/shared/export_meetings_examples.rb @@ -9,7 +9,7 @@ context "with query" do before do - fill_in "q[id_string_or_title_cont]", with: translated(meetings.last.title) + fill_in "q[title_cont]", with: translated(meetings.last.title) find("button[aria-label='Search']").click end diff --git a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb index 23fe788e57505..70abcb86e05a1 100644 --- a/decidim-meetings/spec/system/admin/filter_meetings_spec.rb +++ b/decidim-meetings/spec/system/admin/filter_meetings_spec.rb @@ -102,7 +102,7 @@ def meeting_without_type(type) end end - context "when searching by ID or title" do + context "when searching by title" do let!(:meeting1) { create(:meeting, component:) } let!(:meeting2) { create(:meeting, component:) } let!(:meeting1_title) { translated(meeting1.title) } @@ -110,12 +110,6 @@ def meeting_without_type(type) before { visit_component_admin } - it "can be searched by ID" do - search_by_text(meeting1.id) - - expect(page).to have_content(meeting1_title) - end - it "can be searched by title" do search_by_text(meeting2_title) diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb index a334c7dbafbf0..5f71fdcf7ac99 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/admin/participatory_process_steps/index.html.erb @@ -33,12 +33,12 @@ - + diff --git a/decidim-templates/app/views/decidim/templates/admin/block_user_templates/index.html.erb b/decidim-templates/app/views/decidim/templates/admin/block_user_templates/index.html.erb index f716a9e5f066b..bbb803e7c7c7e 100644 --- a/decidim-templates/app/views/decidim/templates/admin/block_user_templates/index.html.erb +++ b/decidim-templates/app/views/decidim/templates/admin/block_user_templates/index.html.erb @@ -25,7 +25,7 @@ <%= link_to translated_attribute(template.name), edit_block_user_template_path(template) %>
      <%= t("models.initiatives.fields.id", scope: "decidim.admin") %> <%= t("models.initiatives.fields.title", scope: "decidim.admin") %> <%= t("models.initiatives.fields.state", scope: "decidim.admin") %> <%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %>
      "><%= initiative.id %> "> <% if allowed_to? :edit, :initiative, initiative: initiative %> <%= link_to translated_attribute(initiative.title), diff --git a/decidim-initiatives/config/locales/en.yml b/decidim-initiatives/config/locales/en.yml index 92827bf22f216..7ee41dde574f0 100644 --- a/decidim-initiatives/config/locales/en.yml +++ b/decidim-initiatives/config/locales/en.yml @@ -97,7 +97,7 @@ en: type_id_eq: label: Type search_placeholder: - title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Search %{collection} by title, description, ID or author name + title_or_description_or_author_name_or_author_nickname_cont: Search %{collection} by title, description, or author name initiatives_settings: update: error: There was a problem updating the initiatives settings. @@ -119,7 +119,6 @@ en: initiatives: fields: created_at: Created at - id: ID published_at: Published at state: Status supports_count: Signatures diff --git a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb index 28bc1d65f0a08..84c0eb88ab9f7 100644 --- a/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb +++ b/decidim-initiatives/spec/system/admin/admin_manages_initiatives_spec.rb @@ -113,12 +113,6 @@ def initiative_without_area(area) expect(page).to have_content(translated(open_initiative.title)) end - it "can be searched by id" do - search_by_text(open_initiative.id) - - expect(page).to have_content(translated(open_initiative.title)) - end - it "can be searched by author name" do search_by_text(open_initiative.author.name) diff --git a/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb b/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb index 3ee6589bdf8c5..b65690789a4f8 100644 --- a/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb +++ b/decidim-meetings/app/controllers/concerns/decidim/meetings/admin/filterable.rb @@ -45,10 +45,6 @@ def filters_with_values } end - def search_field_predicate - :id_string_or_title_cont - end - def meeting_types Meeting::TYPE_OF_MEETING end diff --git a/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb index 4bb2461857ba8..f1867fe1ba9a0 100644 --- a/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/admin/invites/index.html.erb @@ -48,7 +48,7 @@ <% if invite.sent_at %> - <%= l invite.sent_at, format: :long %> + <%= l invite.sent_at, format: :decidim_short %> <% end %> diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb index 560f69ff903c0..7d1a58b7100b2 100644 --- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meeting-tr.html.erb @@ -1,9 +1,6 @@ <% is_linked = meeting.decidim_component_id != current_component.id %>
      "> - <%= meeting.id %>
      -       		"> <% if allowed_to? :update, :meeting, meeting: meeting %> <%= link_to present(meeting).title(html_escape: true), edit_meeting_path(meeting) %> @@ -13,12 +10,12 @@ "> <% if meeting.start_time %> - <%= l meeting.start_time, format: :long %> + <%= l meeting.start_time, format: :decidim_short %> <% end %> "> <% if meeting.end_time %> - <%= l meeting.end_time, format: :long %> + <%= l meeting.end_time, format: :decidim_short %> <% end %> "> diff --git a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb index eb7eb20d0a364..b0ea27d239202 100644 --- a/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb +++ b/decidim-meetings/app/views/decidim/meetings/admin/meetings/_meetings-thead.html.erb @@ -1,8 +1,5 @@
      - <%= sort_link(query, :id, t("models.meeting.fields.id", scope: "decidim.meetings"), default_order: :desc ) %> - <%= sort_link(query, :translated_title, t("models.meeting.fields.title", scope: "decidim.meetings"), default_order: :desc ) %> "> <% if step.start_date %> - <%= l step.start_date, format: :long %> + <%= l step.start_date, format: :decidim_short %> <% end %> "> <% if step.end_date %> - <%= l step.end_date, format: :long %> + <%= l step.end_date, format: :decidim_short %> <% end %> "> diff --git a/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb b/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb index e83b34bf6f7ec..cc4c68fad8128 100644 --- a/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb +++ b/decidim-participatory_processes/spec/shared/manage_process_steps_examples.rb @@ -53,8 +53,8 @@ within "#steps table" do expect(page).to have_content(translated(attributes[:title])) - expect(page).to have_content("#{Time.new.utc.day},") - expect(page).to have_content("#{(Time.new.utc + 2.days).day},") + expect(page).to have_content(Time.new.utc.day) + expect(page).to have_content((Time.new.utc + 2.days).day) end visit decidim_admin.root_path expect(page).to have_content("created the #{translated(attributes[:title])} phase in") diff --git a/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb b/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb index 0c9a4349a098b..21bad67ffba8c 100644 --- a/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb +++ b/decidim-proposals/app/controllers/concerns/decidim/proposals/admin/filterable.rb @@ -32,10 +32,6 @@ def accessible_proposals_collection collection.with_evaluation_assigned_to(current_user, current_participatory_space) end - def search_field_predicate - :id_string_or_title_cont - end - def filter_config @filter_config ||= Decidim::AdminFilter.new(:proposals).build_for(self) end diff --git a/decidim-proposals/config/locales/en.yml b/decidim-proposals/config/locales/en.yml index 126b43b360eff..0b7db59b1814c 100644 --- a/decidim-proposals/config/locales/en.yml +++ b/decidim-proposals/config/locales/en.yml @@ -146,8 +146,6 @@ en: values: state_not_published: Not answered state_published: Answered - search_placeholder: - id_string_or_title_cont: Search %{collection} by ID or title tooltips: cannot_edit_proposal_info: Cannot edit this proposal as it is created by a participant or it has received any vote deleted_proposal_states_info: Cannot delete this proposal state because there are proposals assigned to it diff --git a/decidim-proposals/spec/shared/export_proposals_examples.rb b/decidim-proposals/spec/shared/export_proposals_examples.rb index 426a2ddac5921..f7a9f36da71b9 100644 --- a/decidim-proposals/spec/shared/export_proposals_examples.rb +++ b/decidim-proposals/spec/shared/export_proposals_examples.rb @@ -10,7 +10,7 @@ context "with query" do before do - fill_in "q[id_string_or_title_cont]", with: translated(proposals.last.title) + fill_in "q[title_cont]", with: translated(proposals.last.title) find("button[aria-label='Search']").click end diff --git a/decidim-proposals/spec/system/admin/filter_proposals_spec.rb b/decidim-proposals/spec/system/admin/filter_proposals_spec.rb index 2f8769208f937..2003cd3c4b8ed 100644 --- a/decidim-proposals/spec/system/admin/filter_proposals_spec.rb +++ b/decidim-proposals/spec/system/admin/filter_proposals_spec.rb @@ -212,7 +212,7 @@ def proposal_without_state(token) end end - context "when searching by ID or title" do + context "when searching by title" do let!(:proposal1) { create(:proposal, component:) } let!(:proposal2) { create(:proposal, component:) } let!(:proposal1_title) { ActionView::Base.full_sanitizer.sanitize(translated(proposal1.title)) } @@ -220,12 +220,6 @@ def proposal_without_state(token) before { visit_component_admin } - it "can be searched by ID" do - search_by_text(proposal1.id) - - expect(page).to have_content(proposal1_title) - end - it "can be searched by title" do search_by_text(proposal2_title) diff --git a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb index 18add8ae23136..a1d2dff243d39 100644 --- a/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb +++ b/decidim-sortitions/app/views/decidim/sortitions/admin/sortitions/show.html.erb @@ -20,7 +20,7 @@
      <%= l sortition.request_timestamp, format: :long %><%= l sortition.request_timestamp, format: :decidim_short %> <%= sortition.dice %> <%= sortition.target_items %> <%= sortition_taxonomies sortition %> "> - <%= l template.created_at, format: :long %> + <%= l template.created_at, format: :decidim_short %> " class="table-list__actions"> "> - <%= l template.created_at, format: :long %> + <%= l template.created_at, format: :decidim_short %> " class="table-list__actions"> "> - <%= l template.created_at, format: :long %> + <%= l template.created_at, format: :decidim_short %> " class="table-list__actions">