- <%= t "decidim.admin.titles.area_types" %>
+ <%= t(".title") %>
<% if allowed_to? :create, :area_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :area_type], class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/areas/index.html.erb b/decidim-admin/app/views/decidim/admin/areas/index.html.erb
index 2d16f0c61a4a9..8f9882e2dbab9 100644
--- a/decidim-admin/app/views/decidim/admin/areas/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/areas/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("areas", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.areas" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :area %>
<%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb
index 8a74bf61f6eba..32ec6003e1918 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
index 8a759b079324e..d8e70bea211e0 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
index 67d609ef67b4c..1fb655c6e7b96 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
index 0852f9065557c..15273c22be758 100644
--- a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t(".attachments_title")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".attachments_title") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment %>
<%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
index e1ec2474f0e12..934d7c2f40109 100644
--- a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
index 086ab32ea54a7..e83213f7b8852 100644
--- a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(".title", name: user.name)) %>
+
<%= t(".title", name: user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/index.html.erb b/decidim-admin/app/views/decidim/admin/components/index.html.erb
index 8786950970980..4b41cdf758314 100644
--- a/decidim-admin/app/views/decidim/admin/components/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to?(:create, :component) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
index 9f57bccc47c3e..0b46cc872ac06 100644
--- a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
index c66b11589e51f..a1c415ffdacb2 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
- Transfer User
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
index 16117766de80e..392d6b569586b 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("title", scope: "decidim.admin.conflicts") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
index 858a3445a11e8..b3a7ec5cc863f 100644
--- a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+ <%= t(".title") %> <%= current_organization_name %>
@@ -46,6 +46,6 @@
<% end %>
<% if current_user.admin_terms_accepted? %>
- <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+ <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
deleted file mode 100644
index 77839a7a15cdf..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We are contacting you to notify you that your password has been changed.
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
deleted file mode 100644
index 708edf07be4be..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to "Change my password", edit_password_url(@resource, reset_password_token: @token) %>
-
-If you did not request this, please ignore this email.
-Your password will not change until you access the link above and create a new one.
diff --git a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
index 6e05cc045575a..31d11247ac7d7 100644
--- a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
+++ b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render partial: "form", object: @form %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
index 2fab7a6d3c532..65649997871f4 100644
--- a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if current_organization.available_authorizations.empty? %>
<%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
- <%= t "decidim.admin.titles.impersonatable_users" %>
+ <%= t ".title" %>
<% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
<%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
index cce55b1bec168..ebd237dbf6062 100644
--- a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if creating_managed_user? %>
- <%= t(".impersonate_new_managed_user") %>
+ <%= t(".title") %>
<% else %>
<% if @form.user.managed? %>
<%= t(".impersonate_existing_managed_user", name: @form.user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
index bdf151be9c30f..14a53b52b2894 100644
--- a/decidim-admin/app/views/decidim/admin/imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
<%= import_manifest.message(:title, self) %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
index cbac48cb47b9e..d85d0543b147f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.admin_log" %>
+ <%= t "decidim.admin.logs.index.title" %>
<%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/index.html.erb b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
index b08e5fe4f8509..7af432ec8134f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
<%= decidim_paginate logs %>
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 c1dfb56faae16..28a5487da2c1f 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
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.impersonations" %>
+ <%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
index c890a31d0ec2a..8df79d3c485e8 100644
--- a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".new_managed_user_promotion") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
index 66599d17432ae..23891cac94b7e 100644
--- a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
- <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+ <%= t ".title", template_name: t(template_manifest.public_name_key) %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
index 362cdd1ffd248..ff6c3600f26aa 100644
--- a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t ".preview" %>
+ <%= t ".title" %>
<% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
index a190d5bed569a..c1f179dbe0460 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
-
+
- <%= t "decidim.admin.titles.participants" %>
+
+ <%= t ".title" %>
+
<%= admin_filter_selector %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..3c306de596edb 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= link_to user.email, "mailto:#{user.email}" %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
index 2ea4feeda353e..dc82f699dd6a0 100644
--- a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("title", scope: "decidim.admin.organization_external_domain_allowlist.form") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
index c6cee2d5210a3..63ab9ef2ce1ee 100644
--- a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -1,4 +1,11 @@
-
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+
+ <%= t ".title" %>
+
+
<%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
diff --git a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
index 4a789ab31623c..d34ec4631dddb 100644
--- a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.scope_types" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :scope_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
diff --git a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
index 7730666b48870..6e3f35dd52160 100644
--- a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
@@ -1,11 +1,11 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
+<% add_decidim_page_title(t(".title")) %>
<% if parent_scope %>
<%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
<% else %>
- <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
+ <%= t ".title" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
index e0b5e3b720961..4e498e12c866f 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", name: resource_title)) %>
+
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
index f099e67eb7fee..238768df7415a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
@@ -1,5 +1,3 @@
-<% add_decidim_page_title(content_blocks_title) %>
-
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
index 36d0aabb9a743..e19a0d32d8ab2 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(content_blocks_title) %>
+
<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
index 3f330918d7615..8ce44f19debee 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(content_block.public_name_key)) %>
+
<%= t content_block.public_name_key %>
diff --git a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
index 023a2d6b92fbc..bcc6f0405309c 100644
--- a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("page_topics", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
index c44814f1a7da1..6c7faa224edd4 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
+
<%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
index 7cc99a8881e32..6fe5a6a8eeb07 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("pages", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :static_page %>
<%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
index 85b867615d752..9dbec1682d5d9 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.statistics" %>
+ <%= t "decidim.admin.statistics.index.title" %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
index 209083c2d9cb2..c846c90b461a3 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render(
partial: "decidim/admin/statistics/statistics",
locals: {
diff --git a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
index f206951a7af75..9cb6426932777 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("taxonomies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.taxonomies" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_taxonomy"), new_taxonomy_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
index d4e0d04a5848d..fa0dd723d2d63 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name))) %>
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(root_taxonomy.name))) %>
- <%= t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name)) %>
+ <%= t(".title", taxonomy: translated_attribute(root_taxonomy.name)) %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_filter"), new_taxonomy_filter_path(root_taxonomy), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
index ec88de7a2a715..8d2fc0f61787d 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render "decidim/admin/taxonomy_filters_selector/taxonomies_select" %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
index 07c677b1a2def..a146049a944e5 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= button_tag class: "button button__secondary button__sm", id: "save-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
index b70d48b8c69f0..389dfd7ce688e 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= link_to decidim_admin.taxonomy_filters_selector_path(taxonomy_filter_id: taxonomy_filter.id, taxonomy_id: root_taxonomy.id, component_id: component.id), remote: true, method: :delete, class: "button button__transparent-secondary button__sm", id: "remove-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
index 56332917d60e4..e77108030c23c 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_item_path(taxonomy_id: taxonomy.id, id: taxonomy_item.id ), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
index b2a4c43a91f36..594d58931c768 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_items_path(taxonomy), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/users/index.html.erb b/decidim-admin/app/views/decidim/admin/users/index.html.erb
index 3d26b0a64acb8..3306f63c147c9 100644
--- a/decidim-admin/app/views/decidim/admin/users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.users" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :admin_user %>
<%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 0d554d179ab7e..2375605ebb12d 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -208,6 +208,9 @@ en:
user:
new: New admin
view_deleted_components: View deleted components
+ admin_terms:
+ show:
+ title: Admin terms of service
admin_terms_of_service:
accept:
error: There was a problem while accepting the admin terms of service.
@@ -221,7 +224,6 @@ en:
alert: 'Required: Review our admin terms of service'
callout: Please take a moment to review the admin terms of service. Otherwise you will not be able to manage the platform.
cta: Review them now.
- title: Admin terms of service
area_types:
create:
error: There was a problem creating a new area type.
@@ -231,6 +233,8 @@ en:
edit:
title: Edit area type
update: Update
+ index:
+ title: Area types
new:
create: Create area type
title: New area type
@@ -248,6 +252,8 @@ en:
edit:
title: Edit area
update: Update
+ index:
+ title: Areas
new:
create: Create area
title: New area
@@ -265,7 +271,7 @@ en:
title: Edit folder
update: Update
index:
- attachment_collections_title: Attachment folders
+ title: Attachment folders
new:
create: Create
title: New folder
@@ -282,7 +288,7 @@ en:
title: Edit attachment
update: Update
index:
- attachments_title: Attachments
+ title: Attachments
new:
create: Create attachment
title: New attachment
@@ -291,6 +297,9 @@ en:
success: Attachment updated successfully.
attachments_privacy_warning:
message: Be careful when working with attachments in a private space. Any participant could share this document to others.
+ authorization_workflows:
+ index:
+ title: Verification methods
autocomplete:
no_results: No results found
search_prompt: Type at least three characters to search.
@@ -335,6 +344,7 @@ en:
name: Component name
type: Component type
visibility: Visibility
+ title: Components
manage_trash:
title: Deleted components
new:
@@ -342,7 +352,6 @@ en:
title: 'Add component: %{name}'
publish:
success: The component has been successfully published.
- title: Components
unpublish:
success: The component has been successfully unpublished.
update:
@@ -354,12 +363,14 @@ en:
unpublished: Unpublished
conflicts:
attempts: Attempts
+ edit:
+ title: Transfer User
'false': 'No'
index:
text: Search by current user email, name or nickname
+ title: Verification conflicts
managed_user_name: Managed User
solved: Solved
- title: Verification conflicts
transfer:
email: Email
error: There was a problem transferring the current participant to managed participant.
@@ -392,6 +403,7 @@ en:
title: Pending Moderations
show:
dropdown: Dropdown
+ title: Dashboard
view_more_logs: View more logs
domain_allowlist:
form:
@@ -488,6 +500,8 @@ en:
form:
save: Save
success: Help sections updated successfully.
+ update:
+ title: Help sections
impersonatable_users:
index:
filter:
@@ -503,6 +517,7 @@ en:
promote: Promote
search: Search
status: Status
+ title: Manageable participants
view_logs: View logs
impersonations:
close_session:
@@ -519,7 +534,7 @@ en:
impersonate: Impersonate
impersonate_existing_managed_user: Manage participant "%{name}"
impersonate_existing_user: Manage participant "%{name}"
- impersonate_new_managed_user: Manage new participant
+ title: Impersonate participant
imports:
and: and
data_errors:
@@ -563,20 +578,25 @@ en:
participatory_space: Find participatory space
text: Search by user email, name or nickname
user: User
+ index:
+ title: Admin log
logs_list:
no_logs_yet: There are no logs yet.
no_matching_logs: There are no logs with the provided search filters. Try to change them and retry.
manage_trash:
deleted_items_warning: You are currently viewing deleted items. To make any edits or changes, you must first restore them.
managed_users:
+ impersonation_logs:
+ index:
+ title: Impersonations
promotion:
error: There was a problem promoting the managed participant.
success: The managed participant has been successfully promoted.
promotions:
new:
explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
- new_managed_user_promotion: New managed participant promotion
promote: Promote
+ title: New managed participant promotion
members:
create:
error: There was a problem adding a member for this participatory space.
@@ -805,7 +825,7 @@ en:
title: Newsletter templates
use_template: Use this template
show:
- preview: 'Preview template: %{template_name}'
+ title: 'Preview template: %{template_name}'
use_template: Use this template
newsletters:
confirm_recipients:
@@ -870,10 +890,10 @@ en:
send_to_user:
sent_successfully: Newsletter has been sent successfully to %{email}
show:
- preview: Preview
select_recipients_to_deliver: Select recipients to deliver
send_me_a_test_email: Send me a test email
subject: Subject
+ title: Preview
update:
error: There was a problem updating this newsletter.
success: Newsletter updated successfully. Please review it before sending.
@@ -907,12 +927,15 @@ en:
send_message: Send message
show_email: Show email
status: Status
+ title: Participants
unblock: Unblock
unofficialize: Unofficialize
new:
badge: Officialization badge
officialize: Officialize
title: Officialize participant "%{name}"
+ show_email:
+ title: Show email
show_email_modal:
description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
email_address: Email address
@@ -957,6 +980,7 @@ en:
success: Organization updated successfully.
organization_external_domain_allowlist:
edit:
+ title: Allowed list of external domains
update: Update
external_domain:
down: Down
@@ -965,7 +989,6 @@ en:
up: Up
form:
add: Add to allowed list
- title: Allowed list of external domains
reminders:
create:
error: There was a problem creating reminders.
@@ -974,6 +997,7 @@ en:
other: "%{count} users will be reminded."
new:
submit: Send
+ title: Send reminders
resource_permissions:
edit:
submit: Submit
@@ -991,6 +1015,8 @@ en:
edit:
title: Edit scope type
update: Update
+ index:
+ title: Scope types
new:
create: Create scope type
title: New scope type
@@ -1007,6 +1033,8 @@ en:
edit:
title: Edit scope
update: Update
+ index:
+ title: Scopes
new:
create: Create scope
title: New scope
@@ -1079,6 +1107,8 @@ en:
edit:
title: Edit topic
update: Update topic
+ index:
+ title: Topics
new:
create: New topic
title: New topic
@@ -1103,6 +1133,7 @@ en:
slug_help_html: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. Example: %{url}'
index:
last_notable_change: Last notable change
+ title: Pages
new:
create: New page
title: New page
@@ -1112,6 +1143,9 @@ en:
update:
error: There was a problem updating this page.
success: Page updated successfully.
+ statistics:
+ index:
+ title: Statistics
taxonomies:
actions:
actions: Actions
@@ -1142,6 +1176,7 @@ en:
description: Taxonomies and filters allow administrators to sort and organize content. For example, add a taxonomy with the city's districts and neighborhoods and then create filters only with the districts or for a specific neighborhood.
new_taxonomy: New taxonomy
no_items_found: No taxonomies found matching the search criteria.
+ title: Taxonomies
name: Name
new:
create: Create taxonomy
@@ -1186,6 +1221,7 @@ en:
description: A taxonomy filter allows admins to sort and filter participatory spaces based on a taxonomy. For example, add a taxonomy filter to sort processes by geographical scope.
empty: There are currently no taxonomy filters. Create a list of taxonomy filters here to sort and filter participatory spaces based on a taxonomy.
new_filter: New filter
+ title: Taxonomy filters for "%{taxonomy}"
new:
back: Back
create: Create taxonomy filter
@@ -1202,13 +1238,17 @@ en:
error: There was a problem updating this taxonomy filter.
success: Taxonomy filter updated successfully.
taxonomy_filters_selector:
+ index:
+ title: Taxonomy filters
new:
add_new_items_html: If you need to set a new filter or item, do it through the configuration settings or by clicking here.
items_count: "%{count} items"
save: Save
+ title: New taxonomy filter selector
show:
items_count: "%{count} items"
remove: Remove
+ title: Taxonomy filter selector
taxonomies_select:
filters: Filters
select_filter: Select a filter
@@ -1223,25 +1263,12 @@ en:
none: None
title: New item in %{taxonomy}
titles:
- admin_log: Admin log
- area_types: Area types
areas: Areas
authorization_workflows: Verification methods
- dashboard: Dashboard
- edit_external_domains: Allowed list of external domains
- impersonatable_users: Manageable participants
- impersonations: Participants management
menu: Menu
- page_topics: Topics
- pages: Pages
panel: Admin
- participants: Participants
- scope_types: Scope types
scopes: Scopes
statistics: Statistics
- taxonomies: Taxonomies
- taxonomy_filters: Taxonomy filters for "%{taxonomy}"
- users: Administrators
tooltips:
cannot_destroy_taxonomy_filter: Cannot destroy this taxonomy filter
cannot_edit_taxonomy_filter: Cannot edit this taxonomy filter
@@ -1265,6 +1292,8 @@ en:
email: Email
name: Name
role: Role
+ index:
+ title: Administrators
new:
create: Invite
title: Invite new administrator
@@ -1276,6 +1305,10 @@ en:
last_week: Last week
no_users_count_statistics_yet: There are no participant count statistics yet.
participants: Participants
+ components:
+ settings:
+ global:
+ taxonomy_filters_unavailable: Selecting taxonomy filters will be possible after the component is created.
forms:
errors:
impersonate_user:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index 2c6b77e359875..57a26599c651e 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "active_link_to", "~> 1.0"
s.add_dependency "decidim-core", version
- s.add_dependency "devise", "~> 4.7"
+ s.add_dependency "devise", ">= 4.7", "< 6.0"
s.add_dependency "devise-i18n", "~> 1.2"
s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
diff --git a/decidim-admin/lib/decidim/admin.rb b/decidim-admin/lib/decidim/admin.rb
index a7778ccba621b..652672dbd120a 100644
--- a/decidim-admin/lib/decidim/admin.rb
+++ b/decidim-admin/lib/decidim/admin.rb
@@ -15,8 +15,6 @@ module Admin
autoload :Import, "decidim/admin/import"
autoload :CustomImport, "decidim/admin/custom_import"
- include ActiveSupport::Configurable
-
# Public: Stores an instance of ViewHooks
def self.view_hooks
@view_hooks ||= ViewHooks.new
diff --git a/decidim-admin/lib/decidim/admin/menu.rb b/decidim-admin/lib/decidim/admin/menu.rb
index 0f92edad7f53c..011d5c7f77ccc 100644
--- a/decidim-admin/lib/decidim/admin/menu.rb
+++ b/decidim-admin/lib/decidim/admin/menu.rb
@@ -48,7 +48,7 @@ def self.register_workflows_menu!
def self.register_impersonate_menu!
Decidim.menu :impersonate_menu do |menu|
menu.add_item :conflicts,
- I18n.t("title", scope: "decidim.admin.conflicts"),
+ I18n.t("title", scope: "decidim.admin.conflicts.index"),
decidim_admin.conflicts_path,
active: is_active_link?(decidim_admin.conflicts_path),
if: allowed_to?(:index, :impersonatable_user)
diff --git a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
index 67e0ec58d1624..adbb0a5cc694b 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
@@ -53,6 +53,7 @@
fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
click_on I18n.t("decidim.admin.block_user.new.action")
+ expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
expect(content.reload).to be_hidden
diff --git a/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
new file mode 100644
index 0000000000000..dc937e285ad5c
--- /dev/null
+++ b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::HomepageContentBlockCell, type: :cell do
+ controller Decidim::Admin::OrganizationHomepageController
+
+ subject { cell("decidim/admin/homepage_content_block", content_block).call }
+
+ let(:organization) { create(:organization) }
+ let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "renders the content block name" do
+ expect(subject).to have_content("Hero image")
+ end
+
+ it "renders a link to edit the content block" do
+ expect(subject).to have_link(href: /edit/)
+ end
+
+ it "renders a link to destroy the content block" do
+ expect(subject).to have_css('a[data-method="delete"][href*="/content_blocks/"]')
+ end
+
+ it "renders the drag handle" do
+ expect(subject).to have_css("[draggable=\"true\"]")
+ end
+
+ context "when content block is not persisted" do
+ let(:content_block) { build(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "does not render edit or destroy links" do
+ expect(subject).to have_no_link(href: %r{/content_blocks/\d+/edit$})
+ expect(subject).to have_no_css('a[data-method="delete"]')
+ end
+ end
+
+ context "when content block has no settings" do
+ let(:content_block) do
+ create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage)
+ end
+
+ it "does not render edit link" do
+ expect(subject).to have_no_link(href: /edit/)
+ end
+ end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index 1ca15f31bb0c5..903dc8d24465c 100644
--- a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -45,6 +45,19 @@ module Decidim::Admin::ParticipatorySpace
expect(members.count).to eq 1
end
+ it "creates the member only one time" do
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 0
+
+ subject.call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+
+ form = double(invalid?: false, email:, current_user:, name:, role:, published: false)
+ described_class.new(form, participatory_space, via_csv:).call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+ end
+
it "creates a new user with no application admin privileges" do
subject.call
expect(Decidim::User.last).not_to be_admin
diff --git a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
index 8b263c5f5a110..0d0425c9c6fff 100644
--- a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
+++ b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
@@ -33,7 +33,7 @@ module Admin
it "breadcrumbs are set" do
get :index
- expect(controller.helpers.breadcrumb_items).to eq([label: "Taxonomies", url: taxonomies_path])
+ expect(controller.helpers.breadcrumb_items).to eq([{ label: "Taxonomies", url: taxonomies_path }])
end
end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index 2010bb0ba5548..0b64b1d7fa75a 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -55,10 +55,23 @@ def render_input
expect(form).to receive(:select).with(
:test,
full_choices,
- options
+ options, { disabled: false }
)
render_input
end
+
+ context "when the field should be disabled" do
+ let(:options) { { include_blank: false, readonly: true, label: "A test" } }
+
+ it "is supported" do
+ expect(form).to receive(:select).with(
+ :test,
+ full_choices,
+ options.except(:readonly), { disabled: true }
+ )
+ render_input
+ end
+ end
end
describe "booleans" do
@@ -188,6 +201,18 @@ def render_input
expect(view).to receive(:render).with(partial: "decidim/admin/components/taxonomy_filters_drawer")
render_input
end
+
+ context "when component is not persisted" do
+ let(:second_component) { build(:dummy_component, participatory_space: current_participatory_space) }
+
+ before do
+ view.instance_variable_set(:@component, second_component)
+ end
+
+ it "renders a message indicating that the component is missing" do
+ expect(render_input).to include("Selecting taxonomy filters will be possible after the component is created.")
+ end
+ end
end
describe "help texts" do
diff --git a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
index a72d503bfa2e1..8d22a78dd64b5 100644
--- a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
+++ b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
@@ -19,7 +19,7 @@
end
it "show Admin log panel" do
- expect(page).to have_content(t("decidim.admin.titles.admin_log"))
+ expect(page).to have_content(t("decidim.admin.logs.index.title"))
end
context "when does not have Pending moderations" do
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index ef869626cbdb4..ff67be3186ad4 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -52,5 +52,130 @@
expect(page).to have_current_path "/admin/admin_terms/show"
end
+
+ it "displays admin password requirements" do
+ visit last_email_link
+
+ expect(page).to have_content("15 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email, the organization's host")
+ expect(page).to have_content("must be different from your old passwords")
+ end
+
+ it "rejects passwords that are too short for admin" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "short123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("password is too short")
+ end
+
+ it "rejects passwords containing the user's name" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "Fiorello123456789!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("is too similar to your name")
+ end
+
+ it "rejects passwords with less than 5 unique characters" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "aaaaaaaaaaaaaaa!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("does not have enough unique characters")
+ end
+ end
+
+ context "when inviting a regular user" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+
+ let!(:invited_user) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited User",
+ email: "invited_user@example.org"
+ },
+ inviter
+ )
+ end
+ end
+
+ it "displays regular user password requirements in help text" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+
+ it "allows accepting invitation with valid user password" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "invited_user"
+ fill_in :invitation_user_password, with: "decidim123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("Your password was set successfully. You are now signed in.")
+ expect(Decidim::User.find_by(email: "invited_user@example.org")).not_to be_admin
+ end
+ end
+
+ context "when admin_password_strong is disabled" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+ let!(:invited_admin) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited Admin",
+ email: "invited_admin@example.org",
+ admin: true
+ },
+ inviter
+ )
+ end
+ end
+
+ before do
+ allow(Decidim.config).to receive(:admin_password_strong).and_return(false)
+ end
+
+ it "displays regular password requirements for admins" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+ end
+
+ context "with invalid invitation token" do
+ it "shows error for invalid token" do
+ visit "/users/invitation/accept?invitation_token=invalid_token"
+
+ expect(page).to have_content("The invitation token provided is not valid")
+ end
end
end
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index efabd2af563e4..28167accf7538 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -61,6 +61,25 @@
expect(page).to have_content("There is an error in this field.")
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization.name["ca"])
+
+ within "#organization-name-tabs" do
+ click_on "English"
+ end
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
context "when there are more than 4 locales in the organization" do
let(:available_locales) { %w(en ca es fr it) }
let(:organization_names) do
@@ -93,6 +112,23 @@
load "#{Decidim::Admin::Engine.root}/app/forms/decidim/admin/organization_form.rb"
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization_names[:ca])
+
+ select "English", from: "organization-name-tabs"
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
it "renders a dropdown for the language selector and switches between languages" do
visit decidim_admin.edit_organization_path
diff --git a/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
new file mode 100644
index 0000000000000..1fd1b638639d4
--- /dev/null
+++ b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin publishes/unpublishes content blocks" do
+ let(:organization) { create(:organization) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ end
+
+ context "when publishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+ it "shows published content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-available" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).not_to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_css("[id^=hero]")
+ end
+ end
+
+ context "when unpublishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+ let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+ it "does not show unpublished content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-actives" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_no_css("[id^=hero]")
+ end
+ end
+end
diff --git a/decidim-admin/spec/system/member_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
index 8be1fb11dfe3f..8e38f2f22e3ed 100644
--- a/decidim-admin/spec/system/member_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -30,7 +30,7 @@
context "when there are existing users" do
before do
- create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
+ create_list(:assembly_member, 3, participatory_space: assembly, organization: assembly.organization)
visit current_path
end
diff --git a/decidim-admin/spec/system/member_spec.rb b/decidim-admin/spec/system/member_spec.rb
index 2afe0b3eec5e7..06f6053943b7c 100644
--- a/decidim-admin/spec/system/member_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -8,7 +8,7 @@
let!(:user) { create(:user, :admin, :confirmed, organization:) }
let(:assembly) { create(:assembly, organization:, has_members: true) }
- let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
+ let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, organization: assembly.organization) }
before do
switch_to_host(organization.host)
diff --git a/decidim-ai/lib/decidim/ai.rb b/decidim-ai/lib/decidim/ai.rb
index 87aaf1f9d8653..18ef28036508a 100644
--- a/decidim-ai/lib/decidim/ai.rb
+++ b/decidim-ai/lib/decidim/ai.rb
@@ -7,7 +7,5 @@ module Ai
autoload :StrategyRegistry, "decidim/ai/strategy_registry"
autoload :SpamDetection, "decidim/ai/spam_detection/spam_detection"
autoload :Language, "decidim/ai/language/language"
-
- include ActiveSupport::Configurable
end
end
diff --git a/decidim-ai/lib/decidim/ai/engine.rb b/decidim-ai/lib/decidim/ai/engine.rb
index 81c0cff9a4eb7..02dcec0a4ccd0 100644
--- a/decidim-ai/lib/decidim/ai/engine.rb
+++ b/decidim-ai/lib/decidim/ai/engine.rb
@@ -117,18 +117,6 @@ class Engine < ::Rails::Engine
.perform_later(data[:resource],
data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
end
- ActiveSupport::Notifications.subscribe("decidim.proposals.create_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
- ActiveSupport::Notifications.subscribe("decidim.proposals.update_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
end
end
diff --git a/decidim-ai/lib/decidim/ai/language/language.rb b/decidim-ai/lib/decidim/ai/language/language.rb
index 6e74db26f4348..d72d165ab4236 100644
--- a/decidim-ai/lib/decidim/ai/language/language.rb
+++ b/decidim-ai/lib/decidim/ai/language/language.rb
@@ -4,7 +4,14 @@ module Decidim
module Ai
module Language
autoload :Formatter, "decidim/ai/language/formatter"
- include ActiveSupport::Configurable
+
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
# Text cleanup service
#
@@ -15,9 +22,7 @@ module Language
# # your code
# end
# end
- config_accessor :formatter do
- Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
- end
+ mattr_accessor :formatter, default: Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
end
end
end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb b/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
deleted file mode 100644
index 7a9f044de545f..0000000000000
--- a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Ai
- module SpamDetection
- module Resource
- class CollaborativeDraft < Base
- def fields = [:body, :title]
-
- protected
-
- def query = Decidim::Proposals::CollaborativeDraft.includes(:moderation)
- end
- end
- end
- end
-end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
index 61bcb72c7a0ec..80d691ce1076d 100644
--- a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
+++ b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
@@ -3,8 +3,6 @@
module Decidim
module Ai
module SpamDetection
- include ActiveSupport::Configurable
-
autoload :Service, "decidim/ai/spam_detection/service"
module Resource
@@ -13,7 +11,6 @@ module Resource
autoload :Debate, "decidim/ai/spam_detection/resource/debate"
autoload :Initiative, "decidim/ai/spam_detection/resource/initiative"
autoload :Proposal, "decidim/ai/spam_detection/resource/proposal"
- autoload :CollaborativeDraft, "decidim/ai/spam_detection/resource/collaborative_draft"
autoload :Meeting, "decidim/ai/spam_detection/resource/meeting"
autoload :UserBaseEntity, "decidim/ai/spam_detection/resource/user_base_entity"
end
@@ -28,31 +25,31 @@ module Strategy
autoload :Bayes, "decidim/ai/spam_detection/strategy/bayes"
end
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
+
# When the engine is consistently marking spam content without errors,
# you can skip human intervention by enabling this functionality
- config_accessor :hide_reported_resources_automatically do
- Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
- end
+ mattr_accessor :hide_reported_resources_automatically, default: Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
# This is the email address used by the spam engine to
# properly identify the user that will report users and content
- config_accessor :reporting_user_email do
- Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
- end
+ mattr_accessor :reporting_user_email, default: Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :resource_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :resource_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
# You can configure the spam delay for the spam detection service.
# The default value is 30 seconds
- config_accessor :spam_detection_delay do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
- end
+ mattr_accessor :spam_detection_delay, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -71,49 +68,41 @@ module Strategy
# }
# }
# }
- config_accessor :resource_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
- }
+ mattr_accessor :resource_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method. or even define own resource visibility criteria.
# This is the place where new resources can be registered following the pattern
# Resource => Handler
- config_accessor :resource_models do
- @models ||= begin
- models = {}
- models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
- models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
- models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
- models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
- models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
- models["Decidim::Proposals::CollaborativeDraft"] = "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" if Decidim.module_installed?("proposals")
- models
- end
+ mattr_accessor :resource_models
+ self.resource_models ||= begin
+ models = {}
+ models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
+ models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
+ models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
+ models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
+ models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
+ models
end
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :resource_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :resource_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :user_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :user_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -132,32 +121,24 @@ module Strategy
# }
# }
# }
- config_accessor :user_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
- }
+ mattr_accessor :user_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method or what a hidden user really is.
- config_accessor :user_models do
- {
- "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity"
- }
- end
+ mattr_accessor :user_models, default: { "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity" }
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :user_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :user_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# this is the generic resource classifier class. If you need to change your own class, please change the
# configuration of `Decidim::Ai::SpamDetection.detection_service` variable.
diff --git a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
deleted file mode 100644
index 247dd8953c591..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User creates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) { Decidim::Proposals::CreateCollaborativeDraft.new(form, author) }
-
- include_examples "Collaborative draft spam analysis"
-end
diff --git a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
deleted file mode 100644
index 563b125e174ee..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User updates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) do
- Decidim::Proposals::UpdateCollaborativeDraft.new(form, author, collaborative_draft)
- end
-
- include_examples "Collaborative draft spam analysis" do
- let!(:collaborative_draft) do
- create(:collaborative_draft,
- component:,
- users: [author],
- title: "Some draft that is not blocked",
- body: "The body for the proposal.")
- end
- end
-end
diff --git a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
index 0cb1ddaf4fd1a..9b2eab63a0d89 100644
--- a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
+++ b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
@@ -103,18 +103,6 @@
include_examples "some resources are being spam"
end
- context "when trained model is Decidim::Proposals::CollaborativeDraft" do
- let(:manifest_name) { "proposals" }
- let(:training) { 8 }
-
- let!(:reportable) { create(:collaborative_draft, component:, users: [author], title: "Hidden resource") }
- let!(:resources) { create_list(:collaborative_draft, 3, component:, users: [author]) }
- let(:resource_models) { { "Decidim::Proposals::CollaborativeDraft" => "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" } }
-
- include_examples "resource is being indexed"
- include_examples "some resources are being spam"
- end
-
context "when trained model is Decidim::Debates::Debate" do
let(:manifest_name) { "debates" }
let(:training) { 8 }
diff --git a/decidim-ai/spec/shared/events_examples.rb b/decidim-ai/spec/shared/events_examples.rb
index 6cdfc2df6d30b..c90dd5d4fc5da 100644
--- a/decidim-ai/spec/shared/events_examples.rb
+++ b/decidim-ai/spec/shared/events_examples.rb
@@ -172,7 +172,7 @@
context "when regular content is added" do
let(:description) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -200,7 +200,7 @@
context "when regular content is added" do
let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -210,31 +210,3 @@
end
end
end
-
-shared_examples "Collaborative draft spam analysis" do
- context "when spam content is added" do
- let(:body) { "Claim your prize today so you can win." }
- let(:title) { "You are the Lucky winner" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 1 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-
- context "when regular content is added" do
- let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 0 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-end
diff --git a/decidim-api/app/controllers/decidim/api/sessions_controller.rb b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
index 97011840cf0bd..6299128062f1c 100644
--- a/decidim-api/app/controllers/decidim/api/sessions_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
@@ -45,7 +45,7 @@ def respond_with(resource, _opts = {})
render json: serialized_user.merge("avatar" => nil)
end
- def respond_to_on_destroy
+ def respond_to_on_destroy(*)
head :ok
end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 479b5af792aa2..3adeff8e3035b 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
end
s.add_dependency "decidim-core", version
- s.add_dependency "devise-jwt", "~> 0.12.1"
+ s.add_dependency "devise-jwt", ">= 0.12.1", "< 0.14.0"
s.add_dependency "graphql", ">= 2.4.17", "< 2.6"
- s.add_dependency "graphql-docs", "~> 5.0"
- s.add_dependency "rack-cors", "~> 1.0"
+ s.add_dependency "graphql-docs", ">= 5", "< 7"
+ s.add_dependency "rack-cors", ">= 1", "< 4"
s.add_development_dependency "decidim-assemblies", version
s.add_development_dependency "decidim-comments", version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 11f9beec80ec2..632f18eb5e53e 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -11,54 +11,44 @@ module Decidim
# This module holds all business logic related to exposing a Public API for
# decidim.
module Api
- include ActiveSupport::Configurable
+ class << self
+ def config = self
- # defines the schema max_per_page to configure GraphQL pagination
- config_accessor :schema_max_per_page do
- Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+ def configure
+ yield self
+ end
end
+ # defines the schema max_per_page to configure GraphQL pagination
+ mattr_accessor :schema_max_per_page, default: Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+
# defines the schema max_complexity to configure GraphQL query complexity
- config_accessor :schema_max_complexity do
- Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
- end
+ mattr_accessor :schema_max_complexity, default: Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
# defines how many aliases are permitted in a query
- config_accessor :max_aliases do
- Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
- end
+ mattr_accessor :max_aliases, default: Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
# defines the schema max_depth to configure GraphQL query max_depth
- config_accessor :schema_max_depth do
- Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- end
+ mattr_accessor :schema_max_depth, default: Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- config_accessor :disclose_system_version do
- Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
- end
+ mattr_accessor :disclose_system_version, default: Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
# makes the API authentication necessary in order to access it
# access it.
- config_accessor :force_api_authentication do
- Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
- end
+ mattr_accessor :force_api_authentication, default: Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
# allows anonymous introspection queries
# If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
# Otherwise, anyone can access it, causing security issues.
- config_accessor :enable_anonymous_introspection do
- Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
- end
+ mattr_accessor :enable_anonymous_introspection, default: Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
# The expiration time of the JWT tokens, after which issued token will
# expire. Recommended to match the value of
# `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
- config_accessor :jwt_expires_in do
- Decidim::Env.new(
- "DECIDIM_API_JWT_EXPIRES_IN",
- Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
- ).to_i
- end
+ mattr_accessor :jwt_expires_in, default: Decidim::Env.new(
+ "DECIDIM_API_JWT_EXPIRES_IN",
+ Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
+ ).to_i
# This declares all the types an interface or union can resolve to. This needs
# to be done in order to be able to have them found. This is a shortcoming of
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index 8a45ea3178273..af78fe6474a65 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when creating a new assembly
# in the system.
class CreateAssembly < Decidim::Commands::CreateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
:promoted, :taxonomizations, :parent, :organization,
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 3042adeeded07..901f911460d51 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -63,7 +63,7 @@ def duplicate_assembly
end
def duplicate_assembly_attachments
- [:hero_image, :banner_image].each do |attribute|
+ [:hero_image].each do |attribute|
next unless @assembly.attached_uploader(attribute).attached?
@duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index e91d4df267451..5747fa541ca5e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when updating a new assembly
# in the system.
class UpdateAssembly < Decidim::Commands::UpdateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
:taxonomizations, :parent, :private_space, :developer_group, :local_area,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
index 0c0d4f6753e0d..9bafd2fcb00b2 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -37,7 +37,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
@@ -63,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
- render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+ render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
index e5e6fcf6d2299..012fa88b7f97a 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
@@ -25,7 +25,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index f453269c3876e..d6b4bcc7cc644 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
index 31b07defed14e..afb1fd8012218 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
@@ -19,6 +19,7 @@ module AssemblyAdmin
included do
include Decidim::Admin::ParticipatorySpaceAdminContext
+
helper_method :current_assembly
add_breadcrumb_item_from_menu :admin_assembly_menu
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 5ab89729e7c4a..cbbfd81cf55d5 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -54,9 +54,7 @@ class AssemblyForm < Form
attribute :duration, Decidim::Attributes::LocalizedDate
attribute :included_at, Decidim::Attributes::LocalizedDate
- attribute :banner_image
attribute :hero_image
- attribute :remove_banner_image, Boolean, default: false
attribute :remove_hero_image, Boolean, default: false
validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,7 +67,6 @@ class AssemblyForm < Form
validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
validates :title, :subtitle, :description, :short_description, translatable_presence: true
- validates :banner_image, passthru: { to: Decidim::Assembly }
validates :hero_image, passthru: { to: Decidim::Assembly }
validates :weight, presence: true
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 208cc845bae6b..eaacc4dec64a8 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -71,9 +71,6 @@ class Assembly < ApplicationRecord
has_one_attached :hero_image
validates_upload :hero_image, uploader: Decidim::HeroImageUploader
- has_one_attached :banner_image
- validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
validates :slug, uniqueness: { scope: :organization }
validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 0629e11cc3264..dded25d18a7ea 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
-
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
-
-
-
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
index 8ef195373f662..2dd8a49aa4c97 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
@@ -50,10 +50,6 @@ export default class extends Controller {
if (isTransparentCheckbox) {
isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-
- if (isTransparentCheckbox.checked) {
- isTransparentCheckbox.checked = false;
- }
}
if (specialFeatures) {
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
index 024b0b10455f1..ed8f5f43512c5 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
@@ -9,10 +9,6 @@ def hero_image_url
assembly.attached_uploader(:hero_image).url
end
- def banner_image_url
- assembly.attached_uploader(:banner_image).url
- end
-
def area_name
return if assembly.area.blank?
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 35be379dc5886..8779856149558 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -42,7 +42,7 @@ def query
def assemblies_user_admins
Decidim::User.where(
id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
- .select(:decidim_user_id)
+ .select(:decidim_user_id)
)
end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index b0b825f029a1f..28900d7a89b9c 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -60,8 +60,6 @@ def import(attributes, _user, opts)
meta_scope: attributes["meta_scope"]
)
import_hero_image(attributes["remote_hero_image_url"])
- import_banner_image(attributes["remote_banner_image_url"])
-
@imported_assembly.save!
@imported_assembly
end
@@ -84,27 +82,24 @@ def import_folders_and_attachments(attachments)
next
end
- begin
- file_tmp = URI.parse(url).open
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t(
- "decidim.assemblies.admin.imports.attachment_error",
- title: attachment_title(file),
- error: format_error(e)
- )
- next
- end
-
Decidim.traceability.perform_action!("create", Attachment, @user) do
attachment = Attachment.new(
title: file["title"],
description: file["description"],
- content_type: file_tmp.content_type,
attached_to: @imported_assembly,
- weight: file["weight"],
- file: file_tmp, # Define attached_to before this
- file_size: file_tmp.size
+ weight: file["weight"]
)
+ begin
+ attachment.attached_uploader(:file).remote_url = url
+ attachment.set_content_type_and_size
+ rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+ @warnings << I18n.t(
+ "decidim.assemblies.admin.imports.attachment_error",
+ title: attachment_title(file),
+ error: format_error(e)
+ )
+ next
+ end
attachment.create_attachment_collection(file["attachment_collection"])
attachment.save!
attachment
@@ -180,14 +175,6 @@ def import_hero_image(url)
@warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
end
- def import_banner_image(url)
- return if url.blank?
-
- @imported_assembly.attached_uploader(:banner_image).remote_url = url
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
- end
-
def format_error(error)
return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
index a6dcfb2f4c0f5..4a5b77bb6aad2 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
@@ -12,7 +12,6 @@ def serialize
url: EngineRouter.main_proxy(resource).assembly_url(resource),
subtitle: resource.subtitle,
remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
- remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
developer_group: resource.developer_group,
local_area: resource.local_area,
meta_scope: resource.meta_scope,
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 861ca7914d867..e176aa7db01cd 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -98,10 +98,6 @@
<%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
-
-
- <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
index d6ed716e4f028..41801f6c9ac24 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index faa12dc4037a2..f8aa07760af84 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if parent_assembly && parent_assembly.self_and_ancestors.length %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
index 41626d1357ee0..1434001b85107 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
@@ -6,7 +6,7 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
);
// Dispatch the `ajax:loaded` event with the newly inserted element
-const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+var insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
var component = new window.Decidim.AdminAssembliesListComponent();
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
index f98ba34f2a9bc..097a30bc1b2f3 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
index d08339df210cd..95e2ade99b9dc 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.new.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
index 18f2eca3dc5c9..dea867b78ac4e 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index b5d593aa340de..f54582cc75785 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
index 45d96fe525a54..b271eed7173f4 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
index aad6260fb5fcd..1afef5e5df6e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :assembly_user_role %>
<%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
index 570517cea9aa0..765c729002a52 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 3fb3b7d068099..6bafa56d3e0ce 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
<% add_decidim_meta_tags(
title: translated_attribute(current_participatory_space.title),
resource: current_participatory_space) %>
@@ -11,13 +11,14 @@ edit_link(
)
%>
-<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
-
-
- <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
- <%= collection.size %>
-
-
+<% content_for :aside do %>
+
+ <%= t("members", scope: "decidim.participatory_space_members.index") %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
<%= render(collection) %>
-
-
+
+<% end %>
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 9e01c707a6196..cd68e71cb2001 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -107,11 +107,8 @@ en:
public: Public
published: Published
unpublished: Unpublished
- manage_trash:
- title: Deleted assemblies
new:
create: Create
- title: New assembly
update:
error: There was a problem updating this assembly.
success: Assembly successfully updated.
@@ -123,7 +120,6 @@ en:
new:
duplicate: Duplicate
select: Select which data you would like to duplicate
- title: Duplicate assembly
assembly_imports:
create:
error: There was a problem importing this assembly.
@@ -131,7 +127,6 @@ en:
new:
import: Import
select: Select which data you would like to import
- title: Import assembly
assembly_publications:
create:
error: There was a problem publishing this assembly.
@@ -146,13 +141,9 @@ en:
destroy:
success: Admin successfully removed from this assembly.
edit:
- title: Update assembly admin
update: Update
- index:
- assembly_admins_title: Assembly admins
new:
create: Create
- title: New assembly admin
update:
error: There was a problem updating an admin for this assembly.
success: Admin updated successfully for this assembly.
@@ -210,8 +201,6 @@ en:
space_filter_for:
assemblies: All assemblies
titles:
- assemblies: Assemblies
- assemblies_deleted: Deleted assemblies
assemblies_types: Assemblies types
tooltips:
deleted_assemblies_info: An assembly can only be deleted if status is "Unpublished".
@@ -247,6 +236,8 @@ en:
assemblies:
admin:
assemblies:
+ edit:
+ title: About this assembly
form:
define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
duration: Duration
@@ -265,24 +256,40 @@ en:
taxonomies: Taxonomies
title: General Information
visibility: Visibility
+ index:
+ title: Assemblies
+ manage_trash:
+ title: Deleted assemblies
+ new:
+ title: New assembly
assembly_duplicates:
form:
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Duplicate assembly
assembly_imports:
form:
document_legend: Add a document
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Import assembly
assembly_members:
form:
explanation: 'Guidance for image:'
image_guide: Preferably a portrait image that does not have any text.
non_user_avatar_help: You should get the consent of the persons before publishing them as a member.
+ assembly_user_roles:
+ edit:
+ title: Update assembly admin
+ index:
+ title: Assembly admins
+ new:
+ title: New assembly admin
content_blocks:
highlighted_assemblies:
max_results: Maximum amount of elements to show
imports:
attachment_error: The attachment "%{title}" could not be imported (%{error}).
- banner_image_error: The banner image could not be imported (%{error}).
hero_image_error: The hero image could not be imported (%{error}).
new_import:
accepted_types:
@@ -311,9 +318,6 @@ en:
type: Type
show:
title: About this assembly
- assembly_members:
- index:
- members: Members
content_blocks:
children_assemblies:
name: Assemblies
@@ -355,9 +359,6 @@ en:
duration: Duration
private_space: This is a private assembly
social_networks_title: Visit assembly on
- assembly_members:
- index:
- title: Members
download_your_data:
show:
assemblies: Assemblies export
diff --git a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
index f5dbd012845c8..063ce22662adc 100644
--- a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
+++ b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
@@ -7,10 +7,10 @@ def change
# required so that test suite works in ci env
enable_extension "ltree"
rescue StandardError
- raise <<-MSG.squish
- Decidim requires the ltree extension to be enabled in your PostgreSQL.
- You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
- super user.
+ raise <<~MSG.squish
+ Decidim requires the ltree extension to be enabled in your PostgreSQL.
+ You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+ super user.
MSG
end
end
diff --git a/decidim-assemblies/lib/decidim/api/assembly_type.rb b/decidim-assemblies/lib/decidim/api/assembly_type.rb
index 1405d7e2aec10..5205f6f7cecab 100644
--- a/decidim-assemblies/lib/decidim/api/assembly_type.rb
+++ b/decidim-assemblies/lib/decidim/api/assembly_type.rb
@@ -17,7 +17,6 @@ class AssemblyType < Decidim::Api::Types::BaseObject
description "An assembly"
- field :banner_image, String, "The banner image for this assembly", null: true
field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
field :children_count, Integer, "Number of children assemblies", null: true
field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
@@ -64,10 +63,6 @@ def url
def hero_image
object.attached_uploader(:hero_image).url
end
-
- def banner_image
- object.attached_uploader(:banner_image).url
- end
end
end
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ebd08fba721d4..2f20677f1623e 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -42,13 +42,12 @@ class Engine < ::Rails::Engine
end
get "/assemblies", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies"
}
get "/assemblies/*rest", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
-
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies/#{params[:rest]}"
}
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/seeds.rb b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
index 4667312ad2f4a..4900aa839bd20 100644
--- a/decidim-assemblies/lib/decidim/assemblies/seeds.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
@@ -60,7 +60,6 @@ def create_assembly!(parent: nil)
end,
organization:,
hero_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? hero_image : nil, # Keep after organization
- banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
promoted: true,
published_at: 2.weeks.ago,
meta_scope: Decidim::Faker::Localized.word,
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index cefe5ad3d9a55..b46807b899ffc 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -27,7 +27,6 @@
description { generate_localized_description(:assembly_description, skip_injection:) }
organization
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
- banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
published_at { Time.current }
deleted_at { nil }
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index 5b175f3ee64f9..e4952a91aa401 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -18,7 +18,6 @@ module Decidim::Assemblies
end
let(:related_process_ids) { [participatory_processes.map(&:id)] }
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:taxonomizations) do
2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
end
@@ -34,7 +33,6 @@ module Decidim::Assemblies
slug: "slug",
meta_scope: { en: "meta scope" },
hero_image:,
- banner_image:,
promoted: nil,
developer_group: { en: "developer group" },
local_area: { en: "local" },
@@ -87,7 +85,6 @@ module Decidim::Assemblies
content_type: "image/jpeg"
)
end
- let(:banner_image) { hero_image }
before do
allow(Decidim::ActionLogger).to receive(:log).and_return(true)
@@ -99,7 +96,6 @@ module Decidim::Assemblies
it "adds errors to the form" do
expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
- expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
subject.call
end
end
@@ -112,14 +108,12 @@ module Decidim::Assemblies
content_type: "image/png"
)
end
- let(:banner_image) { nil }
let(:form) do
Admin::AssemblyForm.from_params(
title: { en: "title" },
subtitle: { en: "subtitle" },
slug: "slug",
hero_image:,
- banner_image:,
description: { en: "description" },
short_description: { en: "short_description" },
organization:
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..ee9b46ea875d5 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -44,10 +44,6 @@ def stub_calls_to_external_files
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 384d61f6e9732..0af3499198faa 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
2.times.map { create(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: my_assembly) }
end
let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
- let(:banner_image) { my_assembly.banner_image }
let(:params) do
{
assembly: {
@@ -69,8 +68,7 @@ module Decidim::Assemblies
end
let(:attachment_params) do
{
- hero_image: hero_image.blob,
- banner_image: banner_image.blob
+ hero_image: hero_image.blob
}
end
let(:context) do
@@ -105,7 +103,6 @@ module Decidim::Assemblies
context "when the uploaded hero image has too large dimensions" do
let(:attachment_params) do
{
- banner_image: banner_image.blob,
hero_image: ActiveStorage::Blob.create_and_upload!(
io: File.open(Decidim::Dev.asset("5000x5000.png")),
filename: "5000x5000.png",
@@ -125,7 +122,6 @@ module Decidim::Assemblies
allow(form).to receive(:invalid?).and_return(false)
expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
my_assembly.errors.add(:hero_image, "File resolution is too large")
- my_assembly.errors.add(:banner_image, "File resolution is too large")
end
it "broadcasts invalid" do
@@ -136,7 +132,6 @@ module Decidim::Assemblies
command.call
expect(form.errors[:hero_image]).not_to be_empty
- expect(form.errors[:banner_image]).not_to be_empty
end
end
@@ -176,14 +171,12 @@ module Decidim::Assemblies
expect(linked_participatory_processes).to match_array(participatory_processes)
end
- context "when homepage image is not updated" do
+ context "when hero image is not updated" do
let(:attachment_params) do
- {
- banner_image: banner_image.blob
- }
+ {}
end
- it "does not replace the homepage image" do
+ it "does not replace the hero image" do
expect(my_assembly).not_to receive(:hero_image=)
command.call
@@ -193,23 +186,6 @@ module Decidim::Assemblies
end
end
- context "when banner image is not updated" do
- let(:attachment_params) do
- {
- hero_image: hero_image.blob
- }
- end
-
- it "does not replace the banner image" do
- expect(my_assembly).not_to receive(:banner_image=)
-
- command.call
- my_assembly.reload
-
- expect(my_assembly.banner_image).to be_present
- end
- end
-
context "when updating the parent assembly" do
let!(:parent_assembly) { create(:assembly, organization:) }
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index cb707515ee6db..6b37e015f9025 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -120,7 +120,6 @@ module Admin
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
"hero_image" => attachment,
- "banner_image" => attachment,
"slug" => slug,
"private_space" => private_space,
"has_members" => has_members,
@@ -185,7 +184,7 @@ module Admin
it { is_expected.not_to be_valid }
end
- context "when attachment (hero_image or banner_image) is too big" do
+ context "when attachment (hero_image) is too big" do
before do
organization.settings.tap do |settings|
settings.upload.maximum_file_size.default = 5
@@ -298,7 +297,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
@@ -351,7 +349,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index e4e50af28d4ad..dc43eac7cab3d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -12,26 +12,17 @@ module Decidim
describe "when no images were uploaded" do
before do
assembly.hero_image.purge
- assembly.banner_image.purge
end
it "return nil for hero_image_url" do
expect(subject.hero_image_url).to be_nil
end
-
- it "return nil for banner_image_url" do
- expect(subject.banner_image_url).to be_nil
- end
end
describe "when images are attached" do
it "resolves hero_image_url" do
expect(subject.hero_image_url).to be_blob_url(assembly.hero_image.blob)
end
-
- it "resolves banner_image_url" do
- expect(subject.banner_image_url).to be_blob_url(assembly.banner_image.blob)
- end
end
end
end
diff --git a/decidim-assemblies/spec/requests/redirect_routes_spec.rb b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
new file mode 100644
index 0000000000000..ad28fe824faf9
--- /dev/null
+++ b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Redirect routes" do
+ let(:organization) { create(:organization, available_locales: %w(en es ca), default_locale: "en") }
+ let(:headers) { { "HOST" => organization.host } }
+
+ it "redirects old url with missing locale" do
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale" do
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+
+ it "redirects to default locale when the locale is invalid" do
+ get("/assemblies?locale=esp", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale and additional params" do
+ get("/assemblies/foo-bar?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies/foo-bar")
+ end
+
+ it "redirects user to the new url" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/ca/assemblies")
+ end
+
+ it "redirects user to the new url when using custom locale" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index f7c15cbab8bc3..50e7761e4d336 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -51,12 +51,10 @@ module Decidim::Assemblies
"created_by" => "citizens",
"meta_scope" => Decidim::Faker::Localized.sentence(word_count: 3),
"announcement" => Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title },
- "remote_hero_image_url" => hero_image_url,
- "remote_banner_image_url" => banner_image_url
+ "remote_hero_image_url" => hero_image_url
}
end
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly correctly" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
@@ -139,95 +137,22 @@ module Decidim::Assemblies
end
end
- context "when banner image URL is present and accessible" do
- let(:banner_image_url) { "http://example.com/banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, banner_image_url)
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
- end
-
- it "imports the assembly with the banner image" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- expect(subject.banner_image).to be_attached
- end
-
- it "has no warnings" do
- subject
- expect(importer.warnings).to be_empty
- end
- end
-
- context "when banner image URL returns 404 error" do
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "does not attach the banner image" do
- subject
- expect(subject.banner_image).not_to be_attached
- end
-
- it "collects a warning about the missing banner image" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported \(404 Not Found\)\./i))
- end
- end
-
- context "when both hero and banner images fail to import" do
- let(:hero_image_url) { "http://example.com/missing-hero.jpg" }
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, hero_image_url).to_return(status: 404)
- stub_request(:head, hero_image_url).to_return(status: 404)
- stub_request(:get, banner_image_url).to_return(status: 500)
- stub_request(:head, banner_image_url).to_return(status: 500)
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "collects warnings for both images" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The hero image could not be imported/i))
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported/i))
- expect(importer.warnings.length).to eq(2)
- end
- end
-
context "when image URL is nil" do
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
context "when image URL is empty string" do
let(:hero_image_url) { "" }
- let(:banner_image_url) { "" }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
@@ -311,6 +236,114 @@ module Decidim::Assemblies
expect(importer.warnings).to include(a_string_matching(/The attachment "Test File" could not be imported \(500 Internal Server Error\)\./i))
end
end
+
+ context "when remote file is accessible and downloadable (PDF)" do
+ let(:remote_file_url) { "http://example.com/document.pdf" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ expect(attachment.file.filename.to_s).to eq("document.pdf")
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("application/pdf")
+ end
+
+ it "sets the file size automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file_size).to be_present
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file is accessible and downloadable (image)" do
+ let(:remote_file_url) { "http://example.com/image.jpg" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("image/jpeg")
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file URL is blank" do
+ let(:attachments_data) do
+ {
+ "files" => [
+ {
+ "title" => { "en" => "Test File" },
+ "description" => { "en" => "Test Description" },
+ "weight" => 1,
+ "remote_file_url" => ""
+ }
+ ],
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
+
+ context "when files array is nil" do
+ let(:attachments_data) do
+ {
+ "files" => nil,
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
end
end
end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 57ec9cb121f86..2577d2432fb03 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
index 9d07c6c3d027c..baee2322438b5 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
@@ -23,7 +23,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index c4a4409979ba0..c98bd31acad1e 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -18,7 +18,7 @@
it "updates an assembly" do
fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
- dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
+ dynamically_attach_file(:assembly_hero_image, image3_path, remove_before: true)
within ".edit_assembly" do
expect(assembly_parent_id_options).not_to include(assembly.id)
@@ -84,12 +84,6 @@
src = page.find("img")["src"]
expect(src).to be_blob_url(hero_blob)
end
-
- banner_blob = assembly.hero_image.blob
- within %([data-active-uploads] [data-filename="#{banner_blob.filename}"]) do
- src = page.find("img")["src"]
- expect(src).to be_blob_url(banner_blob)
- end
end
end
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index f365f2fb79242..8d59e9521f705 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -29,10 +29,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
@@ -115,10 +111,6 @@
.to_return(status: 404, body: "Not Found")
stub_request(:head, "http://example.com/missing-hero.jpg")
.to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
within_admin_menu do
click_on "Import"
@@ -149,115 +141,7 @@
end
end
- context "when banner image URL returns 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 banner",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-banner"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows a warning about the missing banner image" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 banner")
-
- within ".flash.warning" do
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both hero and banner image URLs return 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_hero_image_url"] = "http://example.com/missing-hero.jpg"
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 images",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-both"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows warnings for both missing images" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 images")
-
- within ".flash.warning" do
- expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both image URLs are too long and return 404" do
+ context "when hero image URL is too long and returns 404" do
let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
let(:json_file) do
Tempfile.new(["assemblies", ".json"]).tap do |file|
@@ -269,20 +153,14 @@
Rack::Test::UploadedFile.new(json_file.path, "application/json")
end
let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
- let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
before do
json_data.first["remote_hero_image_url"] = hero_image_url
- json_data.first["remote_banner_image_url"] = banner_image_url
stub_request(:get, hero_image_url)
.to_return(status: 404, body: "Not Found")
stub_request(:head, hero_image_url)
.to_return(status: 404, body: "Not Found")
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
within_admin_menu do
click_on "Import"
@@ -303,13 +181,12 @@
click_on "Import"
end
- it "imports successfully and shows warnings for both missing images" do
+ it "imports successfully and shows warnings for missing hero image" do
expect(page).to have_callout("Assembly successfully imported.")
expect(page).to have_callout("Import assembly with long 404 images")
within ".flash.warning" do
expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
end
end
end
@@ -338,10 +215,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
within_admin_menu do
click_on "Import"
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 9e945e03285ca..e23ed6837013a 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -86,7 +86,6 @@
end
dynamically_attach_file(:assembly_hero_image, image1_path)
- dynamically_attach_file(:assembly_banner_image, image2_path)
within ".new_assembly" do
find("*[type=submit]").click
@@ -111,15 +110,11 @@
visit decidim_admin_assemblies.assemblies_path
end
- it "update a participatory process without images does not delete them" do
+ it "update an assembly without images does not delete them" do
within "tr", text: translated(assembly3.title) do
click_on translated(assembly3.title)
end
- within_admin_sidebar_menu do
- click_on "About this assembly"
- end
-
select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
click_on "Update"
@@ -135,6 +130,18 @@
expect(src).to be_blob_url(hero_blob)
end
end
+
+ describe "when the assembly is transparent" do
+ let!(:assembly3) { create(:assembly, :private, :transparent, organization:) }
+
+ it "shows the transparent checkbox correctly" do
+ within "tr", text: translated(assembly3.title) do
+ click_on translated(assembly3.title)
+ end
+
+ expect(page).to have_checked_field("assembly_is_transparent")
+ end
+ end
end
context "when managing parent assemblies" do
@@ -195,4 +202,61 @@
end
end
end
+
+ context "when navigating grandchild assemblies (3rd level)" do
+ let!(:grandmother_assembly) { create(:assembly, organization:) }
+ let!(:mother_assembly) { create(:assembly, organization:, parent: grandmother_assembly) }
+ let!(:child_assembly) { create(:assembly, :with_content_blocks, organization:, parent: mother_assembly) }
+ let(:assembly) { child_assembly }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ visit decidim_admin_assemblies.assemblies_path
+ end
+
+ describe "listing grandchild assemblies" do
+ it "expands both parent and grandparent assemblies to show child" do
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(child_assembly.title))
+
+ # Opens actions dropdown in child
+ find("button[data-target='actions-assembly-#{child_assembly.id}']").click
+ expect(page).to have_content("Edit")
+ expect(page).to have_content("Share link")
+ expect(page).to have_content("Export")
+
+ # Collapse mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(child_assembly.title))
+ expect(page).to have_content(translated(mother_assembly.title))
+
+ # Collapse grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+ end
+ end
+ end
end
diff --git a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
index a52d4aaefbcf5..1749135152554 100644
--- a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
@@ -5,12 +5,11 @@
describe "Social shares" do
let(:organization) { create(:organization) }
- let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:, banner_image:) }
+ let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:) }
let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
let!(:attachment) { create(:attachment, :with_image, attached_to: assembly, file: attachment_file) }
let(:description) { { en: "Description ![](\"#{description_image_path}\")
" } }
let(:short_description) { { en: "Description ![](\"#{short_description_image_path}\")
" } }
- let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
@@ -44,19 +43,11 @@
context "when no hero_image" do
let(:hero_image) { nil }
- it_behaves_like "a social share meta tag", "city.jpeg"
- end
-
- context "when no direct images" do
- let(:hero_image) { nil }
- let(:banner_image) { nil }
-
it_behaves_like "a social share meta tag", "city3.jpeg"
end
context "when no attachments nor direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
it_behaves_like "a social share meta tag", "description_image.jpg"
@@ -70,7 +61,6 @@
context "when no attachments, description image or direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
@@ -80,7 +70,6 @@
context "when nothing" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index a59648ec90844..c197eb01dd68c 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -83,14 +83,6 @@ module Assemblies
end
end
- describe "bannerImage" do
- let(:query) { "{ bannerImage }" }
-
- it "returns the banner image field" do
- expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
- end
- end
-
describe "promoted" do
let(:query) { "{ promoted }" }
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 506a9bf3b697c..fdedb5a24c0fb 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -77,7 +77,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -200,7 +199,6 @@
it "returns the correct response" do
data = response["assemblies"].first
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
@@ -231,7 +229,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -344,7 +341,6 @@
it "returns the correct response" do
data = response["assembly"]
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index dea863457fd7f..0af90d0f23945 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -26,7 +26,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +48,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index aeffda5c91004..3a7aecce62871 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -36,7 +36,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -58,7 +58,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
@@ -97,11 +97,8 @@ def posts
end
end
- # PROVISIONAL if we implement counter cache
def posts_most_commented
- @posts_most_commented ||= posts.joins(:comments).group(:id)
- .select("count(decidim_comments_comments.id) as counter")
- .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
+ @posts_most_commented ||= posts.order(comments_count: :desc).published_at_desc.limit(7)
end
def add_breadcrumb_item
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 38c74550bb540..c1c1801729431 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -38,7 +38,7 @@ class Post < Blogs::ApplicationRecord
D: :body,
datetime: :created_at
},
- index_on_create: true,
+ index_on_create: ->(post) { post.visible? },
index_on_update: ->(post) { post.visible? })
class << self
diff --git a/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
new file mode 100644
index 0000000000000..322bc8361847d
--- /dev/null
+++ b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages component publication" do
+ include_context "when managing a component as an admin" do
+ let!(:resource) { create(:post, :published, component:) }
+
+ context "when cycling through publication states" do
+ let!(:component) { create(:post_component, participatory_space:) }
+
+ include_examples "cycling through publication states"
+ end
+
+ context "when component is unpublished, and admin publishes" do
+ let!(:component) { create(:post_component, :unpublished, participatory_space:) }
+
+ include_examples "add component resources to search index"
+ end
+
+ context "when component is published, and admin unpublishes" do
+ let!(:component) { create(:post_component, :published, participatory_space:) }
+
+ include_examples "removes component resources from search index"
+ end
+ end
+end
diff --git a/decidim-blogs/spec/system/admin_publishes_component_spec.rb b/decidim-blogs/spec/system/admin_publishes_component_spec.rb
deleted file mode 100644
index 734951b434d63..0000000000000
--- a/decidim-blogs/spec/system/admin_publishes_component_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin publishes component" do
- let(:manifest_name) { "blogs" }
- let!(:resource) { create(:post, component:) }
-
- include_context "when publishing and unpublishing the component"
- include_context "when cycling through publication states"
-end
diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
index e5f196d91df65..5167807fcb88a 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
@@ -35,7 +35,8 @@ def progress_budgets
end
def non_voted_budgets
- budgets.where.not(id: voted.map(&:id))
+ budgets_to_exclude = progress_budgets + voted
+ budgets.where.not(id: budgets_to_exclude.map(&:id))
end
def highlighted?
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..bd80489593723 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class CreateProject < Decidim::Commands::CreateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..522afcf3e0697 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class UpdateProject < Decidim::Commands::UpdateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
def initialize(form, project)
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
index 41dc4fcfe8b1b..a2f334d877695 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
@@ -6,6 +6,7 @@ module Admin
# This controller allows the create or update a budget.
class BudgetsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
+
helper_method :budgets, :budget, :finished_orders, :pending_orders,
:users_with_pending_orders, :users_with_finished_orders
@@ -26,7 +27,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +49,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 7eb5bd00861e6..e45f48995522a 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
include Decidim::Admin::ComponentTaxonomiesHelper
include Decidim::Budgets::Admin::Filterable
+
helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
helper Decidim::Budgets::ProjectsHelper
@@ -39,7 +40,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -62,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
index 22d03155470d7..a60f8ebcf6a9e 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
index 8b4b94a8342bb..dca3242383a8f 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
@@ -22,12 +22,12 @@ def create
AddLineItem.call(persisted_current_order, project, current_user) do
on(:ok) do |order|
self.current_order = order
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
@@ -38,12 +38,12 @@ def destroy
respond_to do |format|
RemoveLineItem.call(current_order, project) do
on(:ok) do |_order|
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 4918e044c4329..eb4b8f4425d82 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -16,7 +16,7 @@ class BudgetForm < Decidim::Form
validates :title, translatable_presence: true
validates :weight, numericality: { greater_than_or_equal_to: 0 }
- validates :total_budget, numericality: { greater_than: 0 }
+ validates :total_budget, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 339ab98e8968f..530e4099dac94 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -26,7 +26,7 @@ class ProjectForm < Decidim::Form
validates :title, translatable_presence: true
validates :description, translatable_presence: true
- validates :budget_amount, presence: true, numericality: { greater_than: 0 }
+ validates :budget_amount, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
validate :notify_missing_attachment_if_errored
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 9990eab6dddcb..e5dcb4b0015a9 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -134,14 +134,14 @@ def attachment_context
end
ransacker :confirmed_orders_count do
- query = <<-SQL.squish
- (
- SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
- FROM decidim_budgets_line_items
- LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
- WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
- AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
- )
+ query = <<~SQL.squish
+ (
+ SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+ FROM decidim_budgets_line_items
+ LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+ WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+ AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+ )
SQL
Arel.sql(query)
end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
index 70bf4c4dc4a39..b16297b1722a6 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
+<% add_decidim_page_title(t(".title", budget: decidim_sanitize_translated(budget.title))) %>
+
- <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+ <%= t(".title", budget: decidim_sanitize_translated(budget.title)) %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index ad4cef7763585..7c2f6e7f77309 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -3,7 +3,7 @@
+ <% if has_replies_in_children? %>
+ <%= render :replies %>
+ <% elsif can_reply? %>
+
+ <% end %>
<% end %>
<% if current_user.present? %>
<%= cell("decidim/report_button", model, modal_id: "flagModalComment#{model.id}").flag_modal %>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 4e0c60d16d97c..3c792e8a940b6 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -86,10 +86,6 @@ def comment_body
formatted_body
end
- def replies
- SortedComments.for(model, order_by: order)
- end
-
def order
options[:order] || "older"
end
@@ -234,7 +230,11 @@ def has_replies?
end
def has_replies_in_children?
- model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
+ replies_count.positive?
+ end
+
+ def replies_count
+ @replies_count ||= model.replies.count
end
# action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
index 9670e0ca5ee7c..78bbcedd57d47 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
@@ -31,7 +31,7 @@
<% end %>
">
- <%= t "decidim.admin.titles.areas" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :area %>
<%= link_to t("actions.add", scope: "decidim.admin"), new_area_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb
index 8a74bf61f6eba..32ec6003e1918 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("attachment_collections.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
index 8a759b079324e..d8e70bea211e0 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
index 67d609ef67b4c..1fb655c6e7b96 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
index 0852f9065557c..15273c22be758 100644
--- a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t(".attachments_title")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".attachments_title") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment %>
<%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
index e1ec2474f0e12..934d7c2f40109 100644
--- a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
index 086ab32ea54a7..e83213f7b8852 100644
--- a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(".title", name: user.name)) %>
+
<%= t(".title", name: user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/index.html.erb b/decidim-admin/app/views/decidim/admin/components/index.html.erb
index 8786950970980..4b41cdf758314 100644
--- a/decidim-admin/app/views/decidim/admin/components/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to?(:create, :component) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
index 9f57bccc47c3e..0b46cc872ac06 100644
--- a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
index c66b11589e51f..a1c415ffdacb2 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
- Transfer User
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
index 16117766de80e..392d6b569586b 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("title", scope: "decidim.admin.conflicts") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
index 858a3445a11e8..b3a7ec5cc863f 100644
--- a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+ <%= t(".title") %> <%= current_organization_name %>
@@ -46,6 +46,6 @@
<% end %>
<% if current_user.admin_terms_accepted? %>
- <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+ <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
deleted file mode 100644
index 77839a7a15cdf..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We are contacting you to notify you that your password has been changed.
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
deleted file mode 100644
index 708edf07be4be..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to "Change my password", edit_password_url(@resource, reset_password_token: @token) %>
-
-If you did not request this, please ignore this email.
-Your password will not change until you access the link above and create a new one.
diff --git a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
index 6e05cc045575a..31d11247ac7d7 100644
--- a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
+++ b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render partial: "form", object: @form %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
index 2fab7a6d3c532..65649997871f4 100644
--- a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if current_organization.available_authorizations.empty? %>
<%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
- <%= t "decidim.admin.titles.impersonatable_users" %>
+ <%= t ".title" %>
<% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
<%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
index cce55b1bec168..ebd237dbf6062 100644
--- a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if creating_managed_user? %>
- <%= t(".impersonate_new_managed_user") %>
+ <%= t(".title") %>
<% else %>
<% if @form.user.managed? %>
<%= t(".impersonate_existing_managed_user", name: @form.user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
index bdf151be9c30f..14a53b52b2894 100644
--- a/decidim-admin/app/views/decidim/admin/imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
<%= import_manifest.message(:title, self) %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
index cbac48cb47b9e..d85d0543b147f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.admin_log" %>
+ <%= t "decidim.admin.logs.index.title" %>
<%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/index.html.erb b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
index b08e5fe4f8509..7af432ec8134f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
<%= decidim_paginate logs %>
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 c1dfb56faae16..28a5487da2c1f 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
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.impersonations" %>
+ <%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
index c890a31d0ec2a..8df79d3c485e8 100644
--- a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".new_managed_user_promotion") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
index 66599d17432ae..23891cac94b7e 100644
--- a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
- <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+ <%= t ".title", template_name: t(template_manifest.public_name_key) %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
index 362cdd1ffd248..ff6c3600f26aa 100644
--- a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t ".preview" %>
+ <%= t ".title" %>
<% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
index a190d5bed569a..c1f179dbe0460 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
-
+
- <%= t "decidim.admin.titles.participants" %>
+
+ <%= t ".title" %>
+
<%= admin_filter_selector %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..3c306de596edb 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= link_to user.email, "mailto:#{user.email}" %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
index 2ea4feeda353e..dc82f699dd6a0 100644
--- a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("title", scope: "decidim.admin.organization_external_domain_allowlist.form") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
index c6cee2d5210a3..63ab9ef2ce1ee 100644
--- a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -1,4 +1,11 @@
-
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+
+ <%= t ".title" %>
+
+
<%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
diff --git a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
index 4a789ab31623c..d34ec4631dddb 100644
--- a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.scope_types" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :scope_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
diff --git a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
index 7730666b48870..6e3f35dd52160 100644
--- a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
@@ -1,11 +1,11 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
+<% add_decidim_page_title(t(".title")) %>
<% if parent_scope %>
<%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
<% else %>
- <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
+ <%= t ".title" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
index e0b5e3b720961..4e498e12c866f 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", name: resource_title)) %>
+
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
index f099e67eb7fee..238768df7415a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
@@ -1,5 +1,3 @@
-<% add_decidim_page_title(content_blocks_title) %>
-
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
index 36d0aabb9a743..e19a0d32d8ab2 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(content_blocks_title) %>
+
<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
index 3f330918d7615..8ce44f19debee 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(content_block.public_name_key)) %>
+
<%= t content_block.public_name_key %>
diff --git a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
index 023a2d6b92fbc..bcc6f0405309c 100644
--- a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("page_topics", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
index c44814f1a7da1..6c7faa224edd4 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
+
<%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
index 7cc99a8881e32..6fe5a6a8eeb07 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("pages", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :static_page %>
<%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
index 85b867615d752..9dbec1682d5d9 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.statistics" %>
+ <%= t "decidim.admin.statistics.index.title" %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
index 209083c2d9cb2..c846c90b461a3 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render(
partial: "decidim/admin/statistics/statistics",
locals: {
diff --git a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
index f206951a7af75..9cb6426932777 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("taxonomies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.taxonomies" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_taxonomy"), new_taxonomy_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
index d4e0d04a5848d..fa0dd723d2d63 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name))) %>
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(root_taxonomy.name))) %>
- <%= t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name)) %>
+ <%= t(".title", taxonomy: translated_attribute(root_taxonomy.name)) %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_filter"), new_taxonomy_filter_path(root_taxonomy), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
index ec88de7a2a715..8d2fc0f61787d 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render "decidim/admin/taxonomy_filters_selector/taxonomies_select" %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
index 07c677b1a2def..a146049a944e5 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= button_tag class: "button button__secondary button__sm", id: "save-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
index b70d48b8c69f0..389dfd7ce688e 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= link_to decidim_admin.taxonomy_filters_selector_path(taxonomy_filter_id: taxonomy_filter.id, taxonomy_id: root_taxonomy.id, component_id: component.id), remote: true, method: :delete, class: "button button__transparent-secondary button__sm", id: "remove-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
index 56332917d60e4..e77108030c23c 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_item_path(taxonomy_id: taxonomy.id, id: taxonomy_item.id ), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
index b2a4c43a91f36..594d58931c768 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_items_path(taxonomy), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/users/index.html.erb b/decidim-admin/app/views/decidim/admin/users/index.html.erb
index 3d26b0a64acb8..3306f63c147c9 100644
--- a/decidim-admin/app/views/decidim/admin/users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.users" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :admin_user %>
<%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 0d554d179ab7e..2375605ebb12d 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -208,6 +208,9 @@ en:
user:
new: New admin
view_deleted_components: View deleted components
+ admin_terms:
+ show:
+ title: Admin terms of service
admin_terms_of_service:
accept:
error: There was a problem while accepting the admin terms of service.
@@ -221,7 +224,6 @@ en:
alert: 'Required: Review our admin terms of service'
callout: Please take a moment to review the admin terms of service. Otherwise you will not be able to manage the platform.
cta: Review them now.
- title: Admin terms of service
area_types:
create:
error: There was a problem creating a new area type.
@@ -231,6 +233,8 @@ en:
edit:
title: Edit area type
update: Update
+ index:
+ title: Area types
new:
create: Create area type
title: New area type
@@ -248,6 +252,8 @@ en:
edit:
title: Edit area
update: Update
+ index:
+ title: Areas
new:
create: Create area
title: New area
@@ -265,7 +271,7 @@ en:
title: Edit folder
update: Update
index:
- attachment_collections_title: Attachment folders
+ title: Attachment folders
new:
create: Create
title: New folder
@@ -282,7 +288,7 @@ en:
title: Edit attachment
update: Update
index:
- attachments_title: Attachments
+ title: Attachments
new:
create: Create attachment
title: New attachment
@@ -291,6 +297,9 @@ en:
success: Attachment updated successfully.
attachments_privacy_warning:
message: Be careful when working with attachments in a private space. Any participant could share this document to others.
+ authorization_workflows:
+ index:
+ title: Verification methods
autocomplete:
no_results: No results found
search_prompt: Type at least three characters to search.
@@ -335,6 +344,7 @@ en:
name: Component name
type: Component type
visibility: Visibility
+ title: Components
manage_trash:
title: Deleted components
new:
@@ -342,7 +352,6 @@ en:
title: 'Add component: %{name}'
publish:
success: The component has been successfully published.
- title: Components
unpublish:
success: The component has been successfully unpublished.
update:
@@ -354,12 +363,14 @@ en:
unpublished: Unpublished
conflicts:
attempts: Attempts
+ edit:
+ title: Transfer User
'false': 'No'
index:
text: Search by current user email, name or nickname
+ title: Verification conflicts
managed_user_name: Managed User
solved: Solved
- title: Verification conflicts
transfer:
email: Email
error: There was a problem transferring the current participant to managed participant.
@@ -392,6 +403,7 @@ en:
title: Pending Moderations
show:
dropdown: Dropdown
+ title: Dashboard
view_more_logs: View more logs
domain_allowlist:
form:
@@ -488,6 +500,8 @@ en:
form:
save: Save
success: Help sections updated successfully.
+ update:
+ title: Help sections
impersonatable_users:
index:
filter:
@@ -503,6 +517,7 @@ en:
promote: Promote
search: Search
status: Status
+ title: Manageable participants
view_logs: View logs
impersonations:
close_session:
@@ -519,7 +534,7 @@ en:
impersonate: Impersonate
impersonate_existing_managed_user: Manage participant "%{name}"
impersonate_existing_user: Manage participant "%{name}"
- impersonate_new_managed_user: Manage new participant
+ title: Impersonate participant
imports:
and: and
data_errors:
@@ -563,20 +578,25 @@ en:
participatory_space: Find participatory space
text: Search by user email, name or nickname
user: User
+ index:
+ title: Admin log
logs_list:
no_logs_yet: There are no logs yet.
no_matching_logs: There are no logs with the provided search filters. Try to change them and retry.
manage_trash:
deleted_items_warning: You are currently viewing deleted items. To make any edits or changes, you must first restore them.
managed_users:
+ impersonation_logs:
+ index:
+ title: Impersonations
promotion:
error: There was a problem promoting the managed participant.
success: The managed participant has been successfully promoted.
promotions:
new:
explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
- new_managed_user_promotion: New managed participant promotion
promote: Promote
+ title: New managed participant promotion
members:
create:
error: There was a problem adding a member for this participatory space.
@@ -805,7 +825,7 @@ en:
title: Newsletter templates
use_template: Use this template
show:
- preview: 'Preview template: %{template_name}'
+ title: 'Preview template: %{template_name}'
use_template: Use this template
newsletters:
confirm_recipients:
@@ -870,10 +890,10 @@ en:
send_to_user:
sent_successfully: Newsletter has been sent successfully to %{email}
show:
- preview: Preview
select_recipients_to_deliver: Select recipients to deliver
send_me_a_test_email: Send me a test email
subject: Subject
+ title: Preview
update:
error: There was a problem updating this newsletter.
success: Newsletter updated successfully. Please review it before sending.
@@ -907,12 +927,15 @@ en:
send_message: Send message
show_email: Show email
status: Status
+ title: Participants
unblock: Unblock
unofficialize: Unofficialize
new:
badge: Officialization badge
officialize: Officialize
title: Officialize participant "%{name}"
+ show_email:
+ title: Show email
show_email_modal:
description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
email_address: Email address
@@ -957,6 +980,7 @@ en:
success: Organization updated successfully.
organization_external_domain_allowlist:
edit:
+ title: Allowed list of external domains
update: Update
external_domain:
down: Down
@@ -965,7 +989,6 @@ en:
up: Up
form:
add: Add to allowed list
- title: Allowed list of external domains
reminders:
create:
error: There was a problem creating reminders.
@@ -974,6 +997,7 @@ en:
other: "%{count} users will be reminded."
new:
submit: Send
+ title: Send reminders
resource_permissions:
edit:
submit: Submit
@@ -991,6 +1015,8 @@ en:
edit:
title: Edit scope type
update: Update
+ index:
+ title: Scope types
new:
create: Create scope type
title: New scope type
@@ -1007,6 +1033,8 @@ en:
edit:
title: Edit scope
update: Update
+ index:
+ title: Scopes
new:
create: Create scope
title: New scope
@@ -1079,6 +1107,8 @@ en:
edit:
title: Edit topic
update: Update topic
+ index:
+ title: Topics
new:
create: New topic
title: New topic
@@ -1103,6 +1133,7 @@ en:
slug_help_html: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. Example: %{url}'
index:
last_notable_change: Last notable change
+ title: Pages
new:
create: New page
title: New page
@@ -1112,6 +1143,9 @@ en:
update:
error: There was a problem updating this page.
success: Page updated successfully.
+ statistics:
+ index:
+ title: Statistics
taxonomies:
actions:
actions: Actions
@@ -1142,6 +1176,7 @@ en:
description: Taxonomies and filters allow administrators to sort and organize content. For example, add a taxonomy with the city's districts and neighborhoods and then create filters only with the districts or for a specific neighborhood.
new_taxonomy: New taxonomy
no_items_found: No taxonomies found matching the search criteria.
+ title: Taxonomies
name: Name
new:
create: Create taxonomy
@@ -1186,6 +1221,7 @@ en:
description: A taxonomy filter allows admins to sort and filter participatory spaces based on a taxonomy. For example, add a taxonomy filter to sort processes by geographical scope.
empty: There are currently no taxonomy filters. Create a list of taxonomy filters here to sort and filter participatory spaces based on a taxonomy.
new_filter: New filter
+ title: Taxonomy filters for "%{taxonomy}"
new:
back: Back
create: Create taxonomy filter
@@ -1202,13 +1238,17 @@ en:
error: There was a problem updating this taxonomy filter.
success: Taxonomy filter updated successfully.
taxonomy_filters_selector:
+ index:
+ title: Taxonomy filters
new:
add_new_items_html: If you need to set a new filter or item, do it through the configuration settings or by clicking here.
items_count: "%{count} items"
save: Save
+ title: New taxonomy filter selector
show:
items_count: "%{count} items"
remove: Remove
+ title: Taxonomy filter selector
taxonomies_select:
filters: Filters
select_filter: Select a filter
@@ -1223,25 +1263,12 @@ en:
none: None
title: New item in %{taxonomy}
titles:
- admin_log: Admin log
- area_types: Area types
areas: Areas
authorization_workflows: Verification methods
- dashboard: Dashboard
- edit_external_domains: Allowed list of external domains
- impersonatable_users: Manageable participants
- impersonations: Participants management
menu: Menu
- page_topics: Topics
- pages: Pages
panel: Admin
- participants: Participants
- scope_types: Scope types
scopes: Scopes
statistics: Statistics
- taxonomies: Taxonomies
- taxonomy_filters: Taxonomy filters for "%{taxonomy}"
- users: Administrators
tooltips:
cannot_destroy_taxonomy_filter: Cannot destroy this taxonomy filter
cannot_edit_taxonomy_filter: Cannot edit this taxonomy filter
@@ -1265,6 +1292,8 @@ en:
email: Email
name: Name
role: Role
+ index:
+ title: Administrators
new:
create: Invite
title: Invite new administrator
@@ -1276,6 +1305,10 @@ en:
last_week: Last week
no_users_count_statistics_yet: There are no participant count statistics yet.
participants: Participants
+ components:
+ settings:
+ global:
+ taxonomy_filters_unavailable: Selecting taxonomy filters will be possible after the component is created.
forms:
errors:
impersonate_user:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index 2c6b77e359875..57a26599c651e 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "active_link_to", "~> 1.0"
s.add_dependency "decidim-core", version
- s.add_dependency "devise", "~> 4.7"
+ s.add_dependency "devise", ">= 4.7", "< 6.0"
s.add_dependency "devise-i18n", "~> 1.2"
s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
diff --git a/decidim-admin/lib/decidim/admin.rb b/decidim-admin/lib/decidim/admin.rb
index a7778ccba621b..652672dbd120a 100644
--- a/decidim-admin/lib/decidim/admin.rb
+++ b/decidim-admin/lib/decidim/admin.rb
@@ -15,8 +15,6 @@ module Admin
autoload :Import, "decidim/admin/import"
autoload :CustomImport, "decidim/admin/custom_import"
- include ActiveSupport::Configurable
-
# Public: Stores an instance of ViewHooks
def self.view_hooks
@view_hooks ||= ViewHooks.new
diff --git a/decidim-admin/lib/decidim/admin/menu.rb b/decidim-admin/lib/decidim/admin/menu.rb
index 0f92edad7f53c..011d5c7f77ccc 100644
--- a/decidim-admin/lib/decidim/admin/menu.rb
+++ b/decidim-admin/lib/decidim/admin/menu.rb
@@ -48,7 +48,7 @@ def self.register_workflows_menu!
def self.register_impersonate_menu!
Decidim.menu :impersonate_menu do |menu|
menu.add_item :conflicts,
- I18n.t("title", scope: "decidim.admin.conflicts"),
+ I18n.t("title", scope: "decidim.admin.conflicts.index"),
decidim_admin.conflicts_path,
active: is_active_link?(decidim_admin.conflicts_path),
if: allowed_to?(:index, :impersonatable_user)
diff --git a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
index 67e0ec58d1624..adbb0a5cc694b 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
@@ -53,6 +53,7 @@
fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
click_on I18n.t("decidim.admin.block_user.new.action")
+ expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
expect(content.reload).to be_hidden
diff --git a/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
new file mode 100644
index 0000000000000..dc937e285ad5c
--- /dev/null
+++ b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::HomepageContentBlockCell, type: :cell do
+ controller Decidim::Admin::OrganizationHomepageController
+
+ subject { cell("decidim/admin/homepage_content_block", content_block).call }
+
+ let(:organization) { create(:organization) }
+ let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "renders the content block name" do
+ expect(subject).to have_content("Hero image")
+ end
+
+ it "renders a link to edit the content block" do
+ expect(subject).to have_link(href: /edit/)
+ end
+
+ it "renders a link to destroy the content block" do
+ expect(subject).to have_css('a[data-method="delete"][href*="/content_blocks/"]')
+ end
+
+ it "renders the drag handle" do
+ expect(subject).to have_css("[draggable=\"true\"]")
+ end
+
+ context "when content block is not persisted" do
+ let(:content_block) { build(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "does not render edit or destroy links" do
+ expect(subject).to have_no_link(href: %r{/content_blocks/\d+/edit$})
+ expect(subject).to have_no_css('a[data-method="delete"]')
+ end
+ end
+
+ context "when content block has no settings" do
+ let(:content_block) do
+ create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage)
+ end
+
+ it "does not render edit link" do
+ expect(subject).to have_no_link(href: /edit/)
+ end
+ end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index 1ca15f31bb0c5..903dc8d24465c 100644
--- a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -45,6 +45,19 @@ module Decidim::Admin::ParticipatorySpace
expect(members.count).to eq 1
end
+ it "creates the member only one time" do
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 0
+
+ subject.call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+
+ form = double(invalid?: false, email:, current_user:, name:, role:, published: false)
+ described_class.new(form, participatory_space, via_csv:).call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+ end
+
it "creates a new user with no application admin privileges" do
subject.call
expect(Decidim::User.last).not_to be_admin
diff --git a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
index 8b263c5f5a110..0d0425c9c6fff 100644
--- a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
+++ b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
@@ -33,7 +33,7 @@ module Admin
it "breadcrumbs are set" do
get :index
- expect(controller.helpers.breadcrumb_items).to eq([label: "Taxonomies", url: taxonomies_path])
+ expect(controller.helpers.breadcrumb_items).to eq([{ label: "Taxonomies", url: taxonomies_path }])
end
end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index 2010bb0ba5548..0b64b1d7fa75a 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -55,10 +55,23 @@ def render_input
expect(form).to receive(:select).with(
:test,
full_choices,
- options
+ options, { disabled: false }
)
render_input
end
+
+ context "when the field should be disabled" do
+ let(:options) { { include_blank: false, readonly: true, label: "A test" } }
+
+ it "is supported" do
+ expect(form).to receive(:select).with(
+ :test,
+ full_choices,
+ options.except(:readonly), { disabled: true }
+ )
+ render_input
+ end
+ end
end
describe "booleans" do
@@ -188,6 +201,18 @@ def render_input
expect(view).to receive(:render).with(partial: "decidim/admin/components/taxonomy_filters_drawer")
render_input
end
+
+ context "when component is not persisted" do
+ let(:second_component) { build(:dummy_component, participatory_space: current_participatory_space) }
+
+ before do
+ view.instance_variable_set(:@component, second_component)
+ end
+
+ it "renders a message indicating that the component is missing" do
+ expect(render_input).to include("Selecting taxonomy filters will be possible after the component is created.")
+ end
+ end
end
describe "help texts" do
diff --git a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
index a72d503bfa2e1..8d22a78dd64b5 100644
--- a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
+++ b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
@@ -19,7 +19,7 @@
end
it "show Admin log panel" do
- expect(page).to have_content(t("decidim.admin.titles.admin_log"))
+ expect(page).to have_content(t("decidim.admin.logs.index.title"))
end
context "when does not have Pending moderations" do
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index ef869626cbdb4..ff67be3186ad4 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -52,5 +52,130 @@
expect(page).to have_current_path "/admin/admin_terms/show"
end
+
+ it "displays admin password requirements" do
+ visit last_email_link
+
+ expect(page).to have_content("15 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email, the organization's host")
+ expect(page).to have_content("must be different from your old passwords")
+ end
+
+ it "rejects passwords that are too short for admin" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "short123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("password is too short")
+ end
+
+ it "rejects passwords containing the user's name" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "Fiorello123456789!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("is too similar to your name")
+ end
+
+ it "rejects passwords with less than 5 unique characters" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "aaaaaaaaaaaaaaa!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("does not have enough unique characters")
+ end
+ end
+
+ context "when inviting a regular user" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+
+ let!(:invited_user) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited User",
+ email: "invited_user@example.org"
+ },
+ inviter
+ )
+ end
+ end
+
+ it "displays regular user password requirements in help text" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+
+ it "allows accepting invitation with valid user password" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "invited_user"
+ fill_in :invitation_user_password, with: "decidim123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("Your password was set successfully. You are now signed in.")
+ expect(Decidim::User.find_by(email: "invited_user@example.org")).not_to be_admin
+ end
+ end
+
+ context "when admin_password_strong is disabled" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+ let!(:invited_admin) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited Admin",
+ email: "invited_admin@example.org",
+ admin: true
+ },
+ inviter
+ )
+ end
+ end
+
+ before do
+ allow(Decidim.config).to receive(:admin_password_strong).and_return(false)
+ end
+
+ it "displays regular password requirements for admins" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+ end
+
+ context "with invalid invitation token" do
+ it "shows error for invalid token" do
+ visit "/users/invitation/accept?invitation_token=invalid_token"
+
+ expect(page).to have_content("The invitation token provided is not valid")
+ end
end
end
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index efabd2af563e4..28167accf7538 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -61,6 +61,25 @@
expect(page).to have_content("There is an error in this field.")
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization.name["ca"])
+
+ within "#organization-name-tabs" do
+ click_on "English"
+ end
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
context "when there are more than 4 locales in the organization" do
let(:available_locales) { %w(en ca es fr it) }
let(:organization_names) do
@@ -93,6 +112,23 @@
load "#{Decidim::Admin::Engine.root}/app/forms/decidim/admin/organization_form.rb"
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization_names[:ca])
+
+ select "English", from: "organization-name-tabs"
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
it "renders a dropdown for the language selector and switches between languages" do
visit decidim_admin.edit_organization_path
diff --git a/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
new file mode 100644
index 0000000000000..1fd1b638639d4
--- /dev/null
+++ b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin publishes/unpublishes content blocks" do
+ let(:organization) { create(:organization) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ end
+
+ context "when publishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+ it "shows published content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-available" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).not_to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_css("[id^=hero]")
+ end
+ end
+
+ context "when unpublishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+ let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+ it "does not show unpublished content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-actives" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_no_css("[id^=hero]")
+ end
+ end
+end
diff --git a/decidim-admin/spec/system/member_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
index 8be1fb11dfe3f..8e38f2f22e3ed 100644
--- a/decidim-admin/spec/system/member_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -30,7 +30,7 @@
context "when there are existing users" do
before do
- create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
+ create_list(:assembly_member, 3, participatory_space: assembly, organization: assembly.organization)
visit current_path
end
diff --git a/decidim-admin/spec/system/member_spec.rb b/decidim-admin/spec/system/member_spec.rb
index 2afe0b3eec5e7..06f6053943b7c 100644
--- a/decidim-admin/spec/system/member_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -8,7 +8,7 @@
let!(:user) { create(:user, :admin, :confirmed, organization:) }
let(:assembly) { create(:assembly, organization:, has_members: true) }
- let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
+ let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, organization: assembly.organization) }
before do
switch_to_host(organization.host)
diff --git a/decidim-ai/lib/decidim/ai.rb b/decidim-ai/lib/decidim/ai.rb
index 87aaf1f9d8653..18ef28036508a 100644
--- a/decidim-ai/lib/decidim/ai.rb
+++ b/decidim-ai/lib/decidim/ai.rb
@@ -7,7 +7,5 @@ module Ai
autoload :StrategyRegistry, "decidim/ai/strategy_registry"
autoload :SpamDetection, "decidim/ai/spam_detection/spam_detection"
autoload :Language, "decidim/ai/language/language"
-
- include ActiveSupport::Configurable
end
end
diff --git a/decidim-ai/lib/decidim/ai/engine.rb b/decidim-ai/lib/decidim/ai/engine.rb
index 81c0cff9a4eb7..02dcec0a4ccd0 100644
--- a/decidim-ai/lib/decidim/ai/engine.rb
+++ b/decidim-ai/lib/decidim/ai/engine.rb
@@ -117,18 +117,6 @@ class Engine < ::Rails::Engine
.perform_later(data[:resource],
data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
end
- ActiveSupport::Notifications.subscribe("decidim.proposals.create_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
- ActiveSupport::Notifications.subscribe("decidim.proposals.update_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
end
end
diff --git a/decidim-ai/lib/decidim/ai/language/language.rb b/decidim-ai/lib/decidim/ai/language/language.rb
index 6e74db26f4348..d72d165ab4236 100644
--- a/decidim-ai/lib/decidim/ai/language/language.rb
+++ b/decidim-ai/lib/decidim/ai/language/language.rb
@@ -4,7 +4,14 @@ module Decidim
module Ai
module Language
autoload :Formatter, "decidim/ai/language/formatter"
- include ActiveSupport::Configurable
+
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
# Text cleanup service
#
@@ -15,9 +22,7 @@ module Language
# # your code
# end
# end
- config_accessor :formatter do
- Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
- end
+ mattr_accessor :formatter, default: Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
end
end
end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb b/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
deleted file mode 100644
index 7a9f044de545f..0000000000000
--- a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Ai
- module SpamDetection
- module Resource
- class CollaborativeDraft < Base
- def fields = [:body, :title]
-
- protected
-
- def query = Decidim::Proposals::CollaborativeDraft.includes(:moderation)
- end
- end
- end
- end
-end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
index 61bcb72c7a0ec..80d691ce1076d 100644
--- a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
+++ b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
@@ -3,8 +3,6 @@
module Decidim
module Ai
module SpamDetection
- include ActiveSupport::Configurable
-
autoload :Service, "decidim/ai/spam_detection/service"
module Resource
@@ -13,7 +11,6 @@ module Resource
autoload :Debate, "decidim/ai/spam_detection/resource/debate"
autoload :Initiative, "decidim/ai/spam_detection/resource/initiative"
autoload :Proposal, "decidim/ai/spam_detection/resource/proposal"
- autoload :CollaborativeDraft, "decidim/ai/spam_detection/resource/collaborative_draft"
autoload :Meeting, "decidim/ai/spam_detection/resource/meeting"
autoload :UserBaseEntity, "decidim/ai/spam_detection/resource/user_base_entity"
end
@@ -28,31 +25,31 @@ module Strategy
autoload :Bayes, "decidim/ai/spam_detection/strategy/bayes"
end
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
+
# When the engine is consistently marking spam content without errors,
# you can skip human intervention by enabling this functionality
- config_accessor :hide_reported_resources_automatically do
- Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
- end
+ mattr_accessor :hide_reported_resources_automatically, default: Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
# This is the email address used by the spam engine to
# properly identify the user that will report users and content
- config_accessor :reporting_user_email do
- Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
- end
+ mattr_accessor :reporting_user_email, default: Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :resource_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :resource_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
# You can configure the spam delay for the spam detection service.
# The default value is 30 seconds
- config_accessor :spam_detection_delay do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
- end
+ mattr_accessor :spam_detection_delay, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -71,49 +68,41 @@ module Strategy
# }
# }
# }
- config_accessor :resource_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
- }
+ mattr_accessor :resource_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method. or even define own resource visibility criteria.
# This is the place where new resources can be registered following the pattern
# Resource => Handler
- config_accessor :resource_models do
- @models ||= begin
- models = {}
- models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
- models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
- models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
- models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
- models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
- models["Decidim::Proposals::CollaborativeDraft"] = "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" if Decidim.module_installed?("proposals")
- models
- end
+ mattr_accessor :resource_models
+ self.resource_models ||= begin
+ models = {}
+ models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
+ models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
+ models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
+ models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
+ models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
+ models
end
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :resource_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :resource_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :user_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :user_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -132,32 +121,24 @@ module Strategy
# }
# }
# }
- config_accessor :user_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
- }
+ mattr_accessor :user_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method or what a hidden user really is.
- config_accessor :user_models do
- {
- "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity"
- }
- end
+ mattr_accessor :user_models, default: { "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity" }
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :user_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :user_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# this is the generic resource classifier class. If you need to change your own class, please change the
# configuration of `Decidim::Ai::SpamDetection.detection_service` variable.
diff --git a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
deleted file mode 100644
index 247dd8953c591..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User creates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) { Decidim::Proposals::CreateCollaborativeDraft.new(form, author) }
-
- include_examples "Collaborative draft spam analysis"
-end
diff --git a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
deleted file mode 100644
index 563b125e174ee..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User updates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) do
- Decidim::Proposals::UpdateCollaborativeDraft.new(form, author, collaborative_draft)
- end
-
- include_examples "Collaborative draft spam analysis" do
- let!(:collaborative_draft) do
- create(:collaborative_draft,
- component:,
- users: [author],
- title: "Some draft that is not blocked",
- body: "The body for the proposal.")
- end
- end
-end
diff --git a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
index 0cb1ddaf4fd1a..9b2eab63a0d89 100644
--- a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
+++ b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
@@ -103,18 +103,6 @@
include_examples "some resources are being spam"
end
- context "when trained model is Decidim::Proposals::CollaborativeDraft" do
- let(:manifest_name) { "proposals" }
- let(:training) { 8 }
-
- let!(:reportable) { create(:collaborative_draft, component:, users: [author], title: "Hidden resource") }
- let!(:resources) { create_list(:collaborative_draft, 3, component:, users: [author]) }
- let(:resource_models) { { "Decidim::Proposals::CollaborativeDraft" => "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" } }
-
- include_examples "resource is being indexed"
- include_examples "some resources are being spam"
- end
-
context "when trained model is Decidim::Debates::Debate" do
let(:manifest_name) { "debates" }
let(:training) { 8 }
diff --git a/decidim-ai/spec/shared/events_examples.rb b/decidim-ai/spec/shared/events_examples.rb
index 6cdfc2df6d30b..c90dd5d4fc5da 100644
--- a/decidim-ai/spec/shared/events_examples.rb
+++ b/decidim-ai/spec/shared/events_examples.rb
@@ -172,7 +172,7 @@
context "when regular content is added" do
let(:description) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -200,7 +200,7 @@
context "when regular content is added" do
let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -210,31 +210,3 @@
end
end
end
-
-shared_examples "Collaborative draft spam analysis" do
- context "when spam content is added" do
- let(:body) { "Claim your prize today so you can win." }
- let(:title) { "You are the Lucky winner" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 1 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-
- context "when regular content is added" do
- let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 0 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-end
diff --git a/decidim-api/app/controllers/decidim/api/sessions_controller.rb b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
index 97011840cf0bd..6299128062f1c 100644
--- a/decidim-api/app/controllers/decidim/api/sessions_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
@@ -45,7 +45,7 @@ def respond_with(resource, _opts = {})
render json: serialized_user.merge("avatar" => nil)
end
- def respond_to_on_destroy
+ def respond_to_on_destroy(*)
head :ok
end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 479b5af792aa2..3adeff8e3035b 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
end
s.add_dependency "decidim-core", version
- s.add_dependency "devise-jwt", "~> 0.12.1"
+ s.add_dependency "devise-jwt", ">= 0.12.1", "< 0.14.0"
s.add_dependency "graphql", ">= 2.4.17", "< 2.6"
- s.add_dependency "graphql-docs", "~> 5.0"
- s.add_dependency "rack-cors", "~> 1.0"
+ s.add_dependency "graphql-docs", ">= 5", "< 7"
+ s.add_dependency "rack-cors", ">= 1", "< 4"
s.add_development_dependency "decidim-assemblies", version
s.add_development_dependency "decidim-comments", version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 11f9beec80ec2..632f18eb5e53e 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -11,54 +11,44 @@ module Decidim
# This module holds all business logic related to exposing a Public API for
# decidim.
module Api
- include ActiveSupport::Configurable
+ class << self
+ def config = self
- # defines the schema max_per_page to configure GraphQL pagination
- config_accessor :schema_max_per_page do
- Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+ def configure
+ yield self
+ end
end
+ # defines the schema max_per_page to configure GraphQL pagination
+ mattr_accessor :schema_max_per_page, default: Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+
# defines the schema max_complexity to configure GraphQL query complexity
- config_accessor :schema_max_complexity do
- Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
- end
+ mattr_accessor :schema_max_complexity, default: Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
# defines how many aliases are permitted in a query
- config_accessor :max_aliases do
- Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
- end
+ mattr_accessor :max_aliases, default: Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
# defines the schema max_depth to configure GraphQL query max_depth
- config_accessor :schema_max_depth do
- Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- end
+ mattr_accessor :schema_max_depth, default: Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- config_accessor :disclose_system_version do
- Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
- end
+ mattr_accessor :disclose_system_version, default: Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
# makes the API authentication necessary in order to access it
# access it.
- config_accessor :force_api_authentication do
- Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
- end
+ mattr_accessor :force_api_authentication, default: Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
# allows anonymous introspection queries
# If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
# Otherwise, anyone can access it, causing security issues.
- config_accessor :enable_anonymous_introspection do
- Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
- end
+ mattr_accessor :enable_anonymous_introspection, default: Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
# The expiration time of the JWT tokens, after which issued token will
# expire. Recommended to match the value of
# `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
- config_accessor :jwt_expires_in do
- Decidim::Env.new(
- "DECIDIM_API_JWT_EXPIRES_IN",
- Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
- ).to_i
- end
+ mattr_accessor :jwt_expires_in, default: Decidim::Env.new(
+ "DECIDIM_API_JWT_EXPIRES_IN",
+ Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
+ ).to_i
# This declares all the types an interface or union can resolve to. This needs
# to be done in order to be able to have them found. This is a shortcoming of
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index 8a45ea3178273..af78fe6474a65 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when creating a new assembly
# in the system.
class CreateAssembly < Decidim::Commands::CreateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
:promoted, :taxonomizations, :parent, :organization,
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 3042adeeded07..901f911460d51 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -63,7 +63,7 @@ def duplicate_assembly
end
def duplicate_assembly_attachments
- [:hero_image, :banner_image].each do |attribute|
+ [:hero_image].each do |attribute|
next unless @assembly.attached_uploader(attribute).attached?
@duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index e91d4df267451..5747fa541ca5e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when updating a new assembly
# in the system.
class UpdateAssembly < Decidim::Commands::UpdateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
:taxonomizations, :parent, :private_space, :developer_group, :local_area,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
index 0c0d4f6753e0d..9bafd2fcb00b2 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -37,7 +37,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
@@ -63,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
- render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+ render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
index e5e6fcf6d2299..012fa88b7f97a 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
@@ -25,7 +25,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index f453269c3876e..d6b4bcc7cc644 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
index 31b07defed14e..afb1fd8012218 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
@@ -19,6 +19,7 @@ module AssemblyAdmin
included do
include Decidim::Admin::ParticipatorySpaceAdminContext
+
helper_method :current_assembly
add_breadcrumb_item_from_menu :admin_assembly_menu
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 5ab89729e7c4a..cbbfd81cf55d5 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -54,9 +54,7 @@ class AssemblyForm < Form
attribute :duration, Decidim::Attributes::LocalizedDate
attribute :included_at, Decidim::Attributes::LocalizedDate
- attribute :banner_image
attribute :hero_image
- attribute :remove_banner_image, Boolean, default: false
attribute :remove_hero_image, Boolean, default: false
validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,7 +67,6 @@ class AssemblyForm < Form
validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
validates :title, :subtitle, :description, :short_description, translatable_presence: true
- validates :banner_image, passthru: { to: Decidim::Assembly }
validates :hero_image, passthru: { to: Decidim::Assembly }
validates :weight, presence: true
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 208cc845bae6b..eaacc4dec64a8 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -71,9 +71,6 @@ class Assembly < ApplicationRecord
has_one_attached :hero_image
validates_upload :hero_image, uploader: Decidim::HeroImageUploader
- has_one_attached :banner_image
- validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
validates :slug, uniqueness: { scope: :organization }
validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 0629e11cc3264..dded25d18a7ea 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
-
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
-
-
-
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
index 8ef195373f662..2dd8a49aa4c97 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
@@ -50,10 +50,6 @@ export default class extends Controller {
if (isTransparentCheckbox) {
isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-
- if (isTransparentCheckbox.checked) {
- isTransparentCheckbox.checked = false;
- }
}
if (specialFeatures) {
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
index 024b0b10455f1..ed8f5f43512c5 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
@@ -9,10 +9,6 @@ def hero_image_url
assembly.attached_uploader(:hero_image).url
end
- def banner_image_url
- assembly.attached_uploader(:banner_image).url
- end
-
def area_name
return if assembly.area.blank?
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 35be379dc5886..8779856149558 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -42,7 +42,7 @@ def query
def assemblies_user_admins
Decidim::User.where(
id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
- .select(:decidim_user_id)
+ .select(:decidim_user_id)
)
end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index b0b825f029a1f..28900d7a89b9c 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -60,8 +60,6 @@ def import(attributes, _user, opts)
meta_scope: attributes["meta_scope"]
)
import_hero_image(attributes["remote_hero_image_url"])
- import_banner_image(attributes["remote_banner_image_url"])
-
@imported_assembly.save!
@imported_assembly
end
@@ -84,27 +82,24 @@ def import_folders_and_attachments(attachments)
next
end
- begin
- file_tmp = URI.parse(url).open
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t(
- "decidim.assemblies.admin.imports.attachment_error",
- title: attachment_title(file),
- error: format_error(e)
- )
- next
- end
-
Decidim.traceability.perform_action!("create", Attachment, @user) do
attachment = Attachment.new(
title: file["title"],
description: file["description"],
- content_type: file_tmp.content_type,
attached_to: @imported_assembly,
- weight: file["weight"],
- file: file_tmp, # Define attached_to before this
- file_size: file_tmp.size
+ weight: file["weight"]
)
+ begin
+ attachment.attached_uploader(:file).remote_url = url
+ attachment.set_content_type_and_size
+ rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+ @warnings << I18n.t(
+ "decidim.assemblies.admin.imports.attachment_error",
+ title: attachment_title(file),
+ error: format_error(e)
+ )
+ next
+ end
attachment.create_attachment_collection(file["attachment_collection"])
attachment.save!
attachment
@@ -180,14 +175,6 @@ def import_hero_image(url)
@warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
end
- def import_banner_image(url)
- return if url.blank?
-
- @imported_assembly.attached_uploader(:banner_image).remote_url = url
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
- end
-
def format_error(error)
return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
index a6dcfb2f4c0f5..4a5b77bb6aad2 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
@@ -12,7 +12,6 @@ def serialize
url: EngineRouter.main_proxy(resource).assembly_url(resource),
subtitle: resource.subtitle,
remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
- remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
developer_group: resource.developer_group,
local_area: resource.local_area,
meta_scope: resource.meta_scope,
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 861ca7914d867..e176aa7db01cd 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -98,10 +98,6 @@
<%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
-
-
- <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
index d6ed716e4f028..41801f6c9ac24 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index faa12dc4037a2..f8aa07760af84 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if parent_assembly && parent_assembly.self_and_ancestors.length %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
index 41626d1357ee0..1434001b85107 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
@@ -6,7 +6,7 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
);
// Dispatch the `ajax:loaded` event with the newly inserted element
-const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+var insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
var component = new window.Decidim.AdminAssembliesListComponent();
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
index f98ba34f2a9bc..097a30bc1b2f3 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
index d08339df210cd..95e2ade99b9dc 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.new.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
index 18f2eca3dc5c9..dea867b78ac4e 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index b5d593aa340de..f54582cc75785 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
index 45d96fe525a54..b271eed7173f4 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
index aad6260fb5fcd..1afef5e5df6e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :assembly_user_role %>
<%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
index 570517cea9aa0..765c729002a52 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 3fb3b7d068099..6bafa56d3e0ce 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
<% add_decidim_meta_tags(
title: translated_attribute(current_participatory_space.title),
resource: current_participatory_space) %>
@@ -11,13 +11,14 @@ edit_link(
)
%>
-<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
-
-
- <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
- <%= collection.size %>
-
-
+<% content_for :aside do %>
+
+ <%= t("members", scope: "decidim.participatory_space_members.index") %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
<%= render(collection) %>
-
-
+
+<% end %>
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 9e01c707a6196..cd68e71cb2001 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -107,11 +107,8 @@ en:
public: Public
published: Published
unpublished: Unpublished
- manage_trash:
- title: Deleted assemblies
new:
create: Create
- title: New assembly
update:
error: There was a problem updating this assembly.
success: Assembly successfully updated.
@@ -123,7 +120,6 @@ en:
new:
duplicate: Duplicate
select: Select which data you would like to duplicate
- title: Duplicate assembly
assembly_imports:
create:
error: There was a problem importing this assembly.
@@ -131,7 +127,6 @@ en:
new:
import: Import
select: Select which data you would like to import
- title: Import assembly
assembly_publications:
create:
error: There was a problem publishing this assembly.
@@ -146,13 +141,9 @@ en:
destroy:
success: Admin successfully removed from this assembly.
edit:
- title: Update assembly admin
update: Update
- index:
- assembly_admins_title: Assembly admins
new:
create: Create
- title: New assembly admin
update:
error: There was a problem updating an admin for this assembly.
success: Admin updated successfully for this assembly.
@@ -210,8 +201,6 @@ en:
space_filter_for:
assemblies: All assemblies
titles:
- assemblies: Assemblies
- assemblies_deleted: Deleted assemblies
assemblies_types: Assemblies types
tooltips:
deleted_assemblies_info: An assembly can only be deleted if status is "Unpublished".
@@ -247,6 +236,8 @@ en:
assemblies:
admin:
assemblies:
+ edit:
+ title: About this assembly
form:
define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
duration: Duration
@@ -265,24 +256,40 @@ en:
taxonomies: Taxonomies
title: General Information
visibility: Visibility
+ index:
+ title: Assemblies
+ manage_trash:
+ title: Deleted assemblies
+ new:
+ title: New assembly
assembly_duplicates:
form:
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Duplicate assembly
assembly_imports:
form:
document_legend: Add a document
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Import assembly
assembly_members:
form:
explanation: 'Guidance for image:'
image_guide: Preferably a portrait image that does not have any text.
non_user_avatar_help: You should get the consent of the persons before publishing them as a member.
+ assembly_user_roles:
+ edit:
+ title: Update assembly admin
+ index:
+ title: Assembly admins
+ new:
+ title: New assembly admin
content_blocks:
highlighted_assemblies:
max_results: Maximum amount of elements to show
imports:
attachment_error: The attachment "%{title}" could not be imported (%{error}).
- banner_image_error: The banner image could not be imported (%{error}).
hero_image_error: The hero image could not be imported (%{error}).
new_import:
accepted_types:
@@ -311,9 +318,6 @@ en:
type: Type
show:
title: About this assembly
- assembly_members:
- index:
- members: Members
content_blocks:
children_assemblies:
name: Assemblies
@@ -355,9 +359,6 @@ en:
duration: Duration
private_space: This is a private assembly
social_networks_title: Visit assembly on
- assembly_members:
- index:
- title: Members
download_your_data:
show:
assemblies: Assemblies export
diff --git a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
index f5dbd012845c8..063ce22662adc 100644
--- a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
+++ b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
@@ -7,10 +7,10 @@ def change
# required so that test suite works in ci env
enable_extension "ltree"
rescue StandardError
- raise <<-MSG.squish
- Decidim requires the ltree extension to be enabled in your PostgreSQL.
- You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
- super user.
+ raise <<~MSG.squish
+ Decidim requires the ltree extension to be enabled in your PostgreSQL.
+ You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+ super user.
MSG
end
end
diff --git a/decidim-assemblies/lib/decidim/api/assembly_type.rb b/decidim-assemblies/lib/decidim/api/assembly_type.rb
index 1405d7e2aec10..5205f6f7cecab 100644
--- a/decidim-assemblies/lib/decidim/api/assembly_type.rb
+++ b/decidim-assemblies/lib/decidim/api/assembly_type.rb
@@ -17,7 +17,6 @@ class AssemblyType < Decidim::Api::Types::BaseObject
description "An assembly"
- field :banner_image, String, "The banner image for this assembly", null: true
field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
field :children_count, Integer, "Number of children assemblies", null: true
field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
@@ -64,10 +63,6 @@ def url
def hero_image
object.attached_uploader(:hero_image).url
end
-
- def banner_image
- object.attached_uploader(:banner_image).url
- end
end
end
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ebd08fba721d4..2f20677f1623e 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -42,13 +42,12 @@ class Engine < ::Rails::Engine
end
get "/assemblies", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies"
}
get "/assemblies/*rest", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
-
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies/#{params[:rest]}"
}
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/seeds.rb b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
index 4667312ad2f4a..4900aa839bd20 100644
--- a/decidim-assemblies/lib/decidim/assemblies/seeds.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
@@ -60,7 +60,6 @@ def create_assembly!(parent: nil)
end,
organization:,
hero_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? hero_image : nil, # Keep after organization
- banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
promoted: true,
published_at: 2.weeks.ago,
meta_scope: Decidim::Faker::Localized.word,
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index cefe5ad3d9a55..b46807b899ffc 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -27,7 +27,6 @@
description { generate_localized_description(:assembly_description, skip_injection:) }
organization
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
- banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
published_at { Time.current }
deleted_at { nil }
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index 5b175f3ee64f9..e4952a91aa401 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -18,7 +18,6 @@ module Decidim::Assemblies
end
let(:related_process_ids) { [participatory_processes.map(&:id)] }
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:taxonomizations) do
2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
end
@@ -34,7 +33,6 @@ module Decidim::Assemblies
slug: "slug",
meta_scope: { en: "meta scope" },
hero_image:,
- banner_image:,
promoted: nil,
developer_group: { en: "developer group" },
local_area: { en: "local" },
@@ -87,7 +85,6 @@ module Decidim::Assemblies
content_type: "image/jpeg"
)
end
- let(:banner_image) { hero_image }
before do
allow(Decidim::ActionLogger).to receive(:log).and_return(true)
@@ -99,7 +96,6 @@ module Decidim::Assemblies
it "adds errors to the form" do
expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
- expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
subject.call
end
end
@@ -112,14 +108,12 @@ module Decidim::Assemblies
content_type: "image/png"
)
end
- let(:banner_image) { nil }
let(:form) do
Admin::AssemblyForm.from_params(
title: { en: "title" },
subtitle: { en: "subtitle" },
slug: "slug",
hero_image:,
- banner_image:,
description: { en: "description" },
short_description: { en: "short_description" },
organization:
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..ee9b46ea875d5 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -44,10 +44,6 @@ def stub_calls_to_external_files
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 384d61f6e9732..0af3499198faa 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
2.times.map { create(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: my_assembly) }
end
let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
- let(:banner_image) { my_assembly.banner_image }
let(:params) do
{
assembly: {
@@ -69,8 +68,7 @@ module Decidim::Assemblies
end
let(:attachment_params) do
{
- hero_image: hero_image.blob,
- banner_image: banner_image.blob
+ hero_image: hero_image.blob
}
end
let(:context) do
@@ -105,7 +103,6 @@ module Decidim::Assemblies
context "when the uploaded hero image has too large dimensions" do
let(:attachment_params) do
{
- banner_image: banner_image.blob,
hero_image: ActiveStorage::Blob.create_and_upload!(
io: File.open(Decidim::Dev.asset("5000x5000.png")),
filename: "5000x5000.png",
@@ -125,7 +122,6 @@ module Decidim::Assemblies
allow(form).to receive(:invalid?).and_return(false)
expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
my_assembly.errors.add(:hero_image, "File resolution is too large")
- my_assembly.errors.add(:banner_image, "File resolution is too large")
end
it "broadcasts invalid" do
@@ -136,7 +132,6 @@ module Decidim::Assemblies
command.call
expect(form.errors[:hero_image]).not_to be_empty
- expect(form.errors[:banner_image]).not_to be_empty
end
end
@@ -176,14 +171,12 @@ module Decidim::Assemblies
expect(linked_participatory_processes).to match_array(participatory_processes)
end
- context "when homepage image is not updated" do
+ context "when hero image is not updated" do
let(:attachment_params) do
- {
- banner_image: banner_image.blob
- }
+ {}
end
- it "does not replace the homepage image" do
+ it "does not replace the hero image" do
expect(my_assembly).not_to receive(:hero_image=)
command.call
@@ -193,23 +186,6 @@ module Decidim::Assemblies
end
end
- context "when banner image is not updated" do
- let(:attachment_params) do
- {
- hero_image: hero_image.blob
- }
- end
-
- it "does not replace the banner image" do
- expect(my_assembly).not_to receive(:banner_image=)
-
- command.call
- my_assembly.reload
-
- expect(my_assembly.banner_image).to be_present
- end
- end
-
context "when updating the parent assembly" do
let!(:parent_assembly) { create(:assembly, organization:) }
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index cb707515ee6db..6b37e015f9025 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -120,7 +120,6 @@ module Admin
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
"hero_image" => attachment,
- "banner_image" => attachment,
"slug" => slug,
"private_space" => private_space,
"has_members" => has_members,
@@ -185,7 +184,7 @@ module Admin
it { is_expected.not_to be_valid }
end
- context "when attachment (hero_image or banner_image) is too big" do
+ context "when attachment (hero_image) is too big" do
before do
organization.settings.tap do |settings|
settings.upload.maximum_file_size.default = 5
@@ -298,7 +297,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
@@ -351,7 +349,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index e4e50af28d4ad..dc43eac7cab3d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -12,26 +12,17 @@ module Decidim
describe "when no images were uploaded" do
before do
assembly.hero_image.purge
- assembly.banner_image.purge
end
it "return nil for hero_image_url" do
expect(subject.hero_image_url).to be_nil
end
-
- it "return nil for banner_image_url" do
- expect(subject.banner_image_url).to be_nil
- end
end
describe "when images are attached" do
it "resolves hero_image_url" do
expect(subject.hero_image_url).to be_blob_url(assembly.hero_image.blob)
end
-
- it "resolves banner_image_url" do
- expect(subject.banner_image_url).to be_blob_url(assembly.banner_image.blob)
- end
end
end
end
diff --git a/decidim-assemblies/spec/requests/redirect_routes_spec.rb b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
new file mode 100644
index 0000000000000..ad28fe824faf9
--- /dev/null
+++ b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Redirect routes" do
+ let(:organization) { create(:organization, available_locales: %w(en es ca), default_locale: "en") }
+ let(:headers) { { "HOST" => organization.host } }
+
+ it "redirects old url with missing locale" do
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale" do
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+
+ it "redirects to default locale when the locale is invalid" do
+ get("/assemblies?locale=esp", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale and additional params" do
+ get("/assemblies/foo-bar?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies/foo-bar")
+ end
+
+ it "redirects user to the new url" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/ca/assemblies")
+ end
+
+ it "redirects user to the new url when using custom locale" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index f7c15cbab8bc3..50e7761e4d336 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -51,12 +51,10 @@ module Decidim::Assemblies
"created_by" => "citizens",
"meta_scope" => Decidim::Faker::Localized.sentence(word_count: 3),
"announcement" => Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title },
- "remote_hero_image_url" => hero_image_url,
- "remote_banner_image_url" => banner_image_url
+ "remote_hero_image_url" => hero_image_url
}
end
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly correctly" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
@@ -139,95 +137,22 @@ module Decidim::Assemblies
end
end
- context "when banner image URL is present and accessible" do
- let(:banner_image_url) { "http://example.com/banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, banner_image_url)
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
- end
-
- it "imports the assembly with the banner image" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- expect(subject.banner_image).to be_attached
- end
-
- it "has no warnings" do
- subject
- expect(importer.warnings).to be_empty
- end
- end
-
- context "when banner image URL returns 404 error" do
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "does not attach the banner image" do
- subject
- expect(subject.banner_image).not_to be_attached
- end
-
- it "collects a warning about the missing banner image" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported \(404 Not Found\)\./i))
- end
- end
-
- context "when both hero and banner images fail to import" do
- let(:hero_image_url) { "http://example.com/missing-hero.jpg" }
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, hero_image_url).to_return(status: 404)
- stub_request(:head, hero_image_url).to_return(status: 404)
- stub_request(:get, banner_image_url).to_return(status: 500)
- stub_request(:head, banner_image_url).to_return(status: 500)
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "collects warnings for both images" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The hero image could not be imported/i))
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported/i))
- expect(importer.warnings.length).to eq(2)
- end
- end
-
context "when image URL is nil" do
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
context "when image URL is empty string" do
let(:hero_image_url) { "" }
- let(:banner_image_url) { "" }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
@@ -311,6 +236,114 @@ module Decidim::Assemblies
expect(importer.warnings).to include(a_string_matching(/The attachment "Test File" could not be imported \(500 Internal Server Error\)\./i))
end
end
+
+ context "when remote file is accessible and downloadable (PDF)" do
+ let(:remote_file_url) { "http://example.com/document.pdf" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ expect(attachment.file.filename.to_s).to eq("document.pdf")
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("application/pdf")
+ end
+
+ it "sets the file size automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file_size).to be_present
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file is accessible and downloadable (image)" do
+ let(:remote_file_url) { "http://example.com/image.jpg" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("image/jpeg")
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file URL is blank" do
+ let(:attachments_data) do
+ {
+ "files" => [
+ {
+ "title" => { "en" => "Test File" },
+ "description" => { "en" => "Test Description" },
+ "weight" => 1,
+ "remote_file_url" => ""
+ }
+ ],
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
+
+ context "when files array is nil" do
+ let(:attachments_data) do
+ {
+ "files" => nil,
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
end
end
end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 57ec9cb121f86..2577d2432fb03 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
index 9d07c6c3d027c..baee2322438b5 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
@@ -23,7 +23,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index c4a4409979ba0..c98bd31acad1e 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -18,7 +18,7 @@
it "updates an assembly" do
fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
- dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
+ dynamically_attach_file(:assembly_hero_image, image3_path, remove_before: true)
within ".edit_assembly" do
expect(assembly_parent_id_options).not_to include(assembly.id)
@@ -84,12 +84,6 @@
src = page.find("img")["src"]
expect(src).to be_blob_url(hero_blob)
end
-
- banner_blob = assembly.hero_image.blob
- within %([data-active-uploads] [data-filename="#{banner_blob.filename}"]) do
- src = page.find("img")["src"]
- expect(src).to be_blob_url(banner_blob)
- end
end
end
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index f365f2fb79242..8d59e9521f705 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -29,10 +29,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
@@ -115,10 +111,6 @@
.to_return(status: 404, body: "Not Found")
stub_request(:head, "http://example.com/missing-hero.jpg")
.to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
within_admin_menu do
click_on "Import"
@@ -149,115 +141,7 @@
end
end
- context "when banner image URL returns 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 banner",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-banner"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows a warning about the missing banner image" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 banner")
-
- within ".flash.warning" do
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both hero and banner image URLs return 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_hero_image_url"] = "http://example.com/missing-hero.jpg"
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 images",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-both"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows warnings for both missing images" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 images")
-
- within ".flash.warning" do
- expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both image URLs are too long and return 404" do
+ context "when hero image URL is too long and returns 404" do
let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
let(:json_file) do
Tempfile.new(["assemblies", ".json"]).tap do |file|
@@ -269,20 +153,14 @@
Rack::Test::UploadedFile.new(json_file.path, "application/json")
end
let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
- let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
before do
json_data.first["remote_hero_image_url"] = hero_image_url
- json_data.first["remote_banner_image_url"] = banner_image_url
stub_request(:get, hero_image_url)
.to_return(status: 404, body: "Not Found")
stub_request(:head, hero_image_url)
.to_return(status: 404, body: "Not Found")
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
within_admin_menu do
click_on "Import"
@@ -303,13 +181,12 @@
click_on "Import"
end
- it "imports successfully and shows warnings for both missing images" do
+ it "imports successfully and shows warnings for missing hero image" do
expect(page).to have_callout("Assembly successfully imported.")
expect(page).to have_callout("Import assembly with long 404 images")
within ".flash.warning" do
expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
end
end
end
@@ -338,10 +215,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
within_admin_menu do
click_on "Import"
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 9e945e03285ca..e23ed6837013a 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -86,7 +86,6 @@
end
dynamically_attach_file(:assembly_hero_image, image1_path)
- dynamically_attach_file(:assembly_banner_image, image2_path)
within ".new_assembly" do
find("*[type=submit]").click
@@ -111,15 +110,11 @@
visit decidim_admin_assemblies.assemblies_path
end
- it "update a participatory process without images does not delete them" do
+ it "update an assembly without images does not delete them" do
within "tr", text: translated(assembly3.title) do
click_on translated(assembly3.title)
end
- within_admin_sidebar_menu do
- click_on "About this assembly"
- end
-
select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
click_on "Update"
@@ -135,6 +130,18 @@
expect(src).to be_blob_url(hero_blob)
end
end
+
+ describe "when the assembly is transparent" do
+ let!(:assembly3) { create(:assembly, :private, :transparent, organization:) }
+
+ it "shows the transparent checkbox correctly" do
+ within "tr", text: translated(assembly3.title) do
+ click_on translated(assembly3.title)
+ end
+
+ expect(page).to have_checked_field("assembly_is_transparent")
+ end
+ end
end
context "when managing parent assemblies" do
@@ -195,4 +202,61 @@
end
end
end
+
+ context "when navigating grandchild assemblies (3rd level)" do
+ let!(:grandmother_assembly) { create(:assembly, organization:) }
+ let!(:mother_assembly) { create(:assembly, organization:, parent: grandmother_assembly) }
+ let!(:child_assembly) { create(:assembly, :with_content_blocks, organization:, parent: mother_assembly) }
+ let(:assembly) { child_assembly }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ visit decidim_admin_assemblies.assemblies_path
+ end
+
+ describe "listing grandchild assemblies" do
+ it "expands both parent and grandparent assemblies to show child" do
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(child_assembly.title))
+
+ # Opens actions dropdown in child
+ find("button[data-target='actions-assembly-#{child_assembly.id}']").click
+ expect(page).to have_content("Edit")
+ expect(page).to have_content("Share link")
+ expect(page).to have_content("Export")
+
+ # Collapse mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(child_assembly.title))
+ expect(page).to have_content(translated(mother_assembly.title))
+
+ # Collapse grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+ end
+ end
+ end
end
diff --git a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
index a52d4aaefbcf5..1749135152554 100644
--- a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
@@ -5,12 +5,11 @@
describe "Social shares" do
let(:organization) { create(:organization) }
- let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:, banner_image:) }
+ let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:) }
let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
let!(:attachment) { create(:attachment, :with_image, attached_to: assembly, file: attachment_file) }
let(:description) { { en: "Description
" } }
let(:short_description) { { en: "Description
" } }
- let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
@@ -44,19 +43,11 @@
context "when no hero_image" do
let(:hero_image) { nil }
- it_behaves_like "a social share meta tag", "city.jpeg"
- end
-
- context "when no direct images" do
- let(:hero_image) { nil }
- let(:banner_image) { nil }
-
it_behaves_like "a social share meta tag", "city3.jpeg"
end
context "when no attachments nor direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
it_behaves_like "a social share meta tag", "description_image.jpg"
@@ -70,7 +61,6 @@
context "when no attachments, description image or direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
@@ -80,7 +70,6 @@
context "when nothing" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index a59648ec90844..c197eb01dd68c 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -83,14 +83,6 @@ module Assemblies
end
end
- describe "bannerImage" do
- let(:query) { "{ bannerImage }" }
-
- it "returns the banner image field" do
- expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
- end
- end
-
describe "promoted" do
let(:query) { "{ promoted }" }
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 506a9bf3b697c..fdedb5a24c0fb 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -77,7 +77,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -200,7 +199,6 @@
it "returns the correct response" do
data = response["assemblies"].first
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
@@ -231,7 +229,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -344,7 +341,6 @@
it "returns the correct response" do
data = response["assembly"]
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index dea863457fd7f..0af90d0f23945 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -26,7 +26,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +48,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index aeffda5c91004..3a7aecce62871 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -36,7 +36,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -58,7 +58,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
@@ -97,11 +97,8 @@ def posts
end
end
- # PROVISIONAL if we implement counter cache
def posts_most_commented
- @posts_most_commented ||= posts.joins(:comments).group(:id)
- .select("count(decidim_comments_comments.id) as counter")
- .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
+ @posts_most_commented ||= posts.order(comments_count: :desc).published_at_desc.limit(7)
end
def add_breadcrumb_item
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 38c74550bb540..c1c1801729431 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -38,7 +38,7 @@ class Post < Blogs::ApplicationRecord
D: :body,
datetime: :created_at
},
- index_on_create: true,
+ index_on_create: ->(post) { post.visible? },
index_on_update: ->(post) { post.visible? })
class << self
diff --git a/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
new file mode 100644
index 0000000000000..322bc8361847d
--- /dev/null
+++ b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages component publication" do
+ include_context "when managing a component as an admin" do
+ let!(:resource) { create(:post, :published, component:) }
+
+ context "when cycling through publication states" do
+ let!(:component) { create(:post_component, participatory_space:) }
+
+ include_examples "cycling through publication states"
+ end
+
+ context "when component is unpublished, and admin publishes" do
+ let!(:component) { create(:post_component, :unpublished, participatory_space:) }
+
+ include_examples "add component resources to search index"
+ end
+
+ context "when component is published, and admin unpublishes" do
+ let!(:component) { create(:post_component, :published, participatory_space:) }
+
+ include_examples "removes component resources from search index"
+ end
+ end
+end
diff --git a/decidim-blogs/spec/system/admin_publishes_component_spec.rb b/decidim-blogs/spec/system/admin_publishes_component_spec.rb
deleted file mode 100644
index 734951b434d63..0000000000000
--- a/decidim-blogs/spec/system/admin_publishes_component_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin publishes component" do
- let(:manifest_name) { "blogs" }
- let!(:resource) { create(:post, component:) }
-
- include_context "when publishing and unpublishing the component"
- include_context "when cycling through publication states"
-end
diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
index e5f196d91df65..5167807fcb88a 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
@@ -35,7 +35,8 @@ def progress_budgets
end
def non_voted_budgets
- budgets.where.not(id: voted.map(&:id))
+ budgets_to_exclude = progress_budgets + voted
+ budgets.where.not(id: budgets_to_exclude.map(&:id))
end
def highlighted?
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..bd80489593723 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class CreateProject < Decidim::Commands::CreateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..522afcf3e0697 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class UpdateProject < Decidim::Commands::UpdateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
def initialize(form, project)
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
index 41dc4fcfe8b1b..a2f334d877695 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
@@ -6,6 +6,7 @@ module Admin
# This controller allows the create or update a budget.
class BudgetsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
+
helper_method :budgets, :budget, :finished_orders, :pending_orders,
:users_with_pending_orders, :users_with_finished_orders
@@ -26,7 +27,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +49,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 7eb5bd00861e6..e45f48995522a 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
include Decidim::Admin::ComponentTaxonomiesHelper
include Decidim::Budgets::Admin::Filterable
+
helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
helper Decidim::Budgets::ProjectsHelper
@@ -39,7 +40,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -62,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
index 22d03155470d7..a60f8ebcf6a9e 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
index 8b4b94a8342bb..dca3242383a8f 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
@@ -22,12 +22,12 @@ def create
AddLineItem.call(persisted_current_order, project, current_user) do
on(:ok) do |order|
self.current_order = order
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
@@ -38,12 +38,12 @@ def destroy
respond_to do |format|
RemoveLineItem.call(current_order, project) do
on(:ok) do |_order|
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 4918e044c4329..eb4b8f4425d82 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -16,7 +16,7 @@ class BudgetForm < Decidim::Form
validates :title, translatable_presence: true
validates :weight, numericality: { greater_than_or_equal_to: 0 }
- validates :total_budget, numericality: { greater_than: 0 }
+ validates :total_budget, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 339ab98e8968f..530e4099dac94 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -26,7 +26,7 @@ class ProjectForm < Decidim::Form
validates :title, translatable_presence: true
validates :description, translatable_presence: true
- validates :budget_amount, presence: true, numericality: { greater_than: 0 }
+ validates :budget_amount, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
validate :notify_missing_attachment_if_errored
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 9990eab6dddcb..e5dcb4b0015a9 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -134,14 +134,14 @@ def attachment_context
end
ransacker :confirmed_orders_count do
- query = <<-SQL.squish
- (
- SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
- FROM decidim_budgets_line_items
- LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
- WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
- AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
- )
+ query = <<~SQL.squish
+ (
+ SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+ FROM decidim_budgets_line_items
+ LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+ WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+ AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+ )
SQL
Arel.sql(query)
end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
index 70bf4c4dc4a39..b16297b1722a6 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
+<% add_decidim_page_title(t(".title", budget: decidim_sanitize_translated(budget.title))) %>
+
- <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+ <%= t(".title", budget: decidim_sanitize_translated(budget.title)) %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index ad4cef7763585..7c2f6e7f77309 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -3,7 +3,7 @@
+ <% if has_replies_in_children? %>
+ <%= render :replies %>
+ <% elsif can_reply? %>
+
+ <% end %>
<% end %>
<% if current_user.present? %>
<%= cell("decidim/report_button", model, modal_id: "flagModalComment#{model.id}").flag_modal %>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 4e0c60d16d97c..3c792e8a940b6 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -86,10 +86,6 @@ def comment_body
formatted_body
end
- def replies
- SortedComments.for(model, order_by: order)
- end
-
def order
options[:order] || "older"
end
@@ -234,7 +230,11 @@ def has_replies?
end
def has_replies_in_children?
- model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
+ replies_count.positive?
+ end
+
+ def replies_count
+ @replies_count ||= model.replies.count
end
# action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
index 9670e0ca5ee7c..78bbcedd57d47 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
@@ -31,7 +31,7 @@
<% end %>
">
- <%= t("attachment_collections.edit.title", scope: "decidim.admin") %> + <%= t(".title") %>
- <%= t("attachment_collections.index.attachment_collections_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("actions.attachment_collection.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb b/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
index 67d609ef67b4c..1fb655c6e7b96 100644
--- a/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachment_collections/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("attachment_collections.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("attachment_collections.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
index 0852f9065557c..15273c22be758 100644
--- a/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/attachments/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t(".attachments_title")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".attachments_title") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment %>
<%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
index e1ec2474f0e12..934d7c2f40109 100644
--- a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
index 086ab32ea54a7..e83213f7b8852 100644
--- a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(".title", name: user.name)) %>
+
<%= t(".title", name: user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/index.html.erb b/decidim-admin/app/views/decidim/admin/components/index.html.erb
index 8786950970980..4b41cdf758314 100644
--- a/decidim-admin/app/views/decidim/admin/components/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to?(:create, :component) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
index 9f57bccc47c3e..0b46cc872ac06 100644
--- a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
index c66b11589e51f..a1c415ffdacb2 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
- Transfer User
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
index 16117766de80e..392d6b569586b 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("title", scope: "decidim.admin.conflicts") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
index 858a3445a11e8..b3a7ec5cc863f 100644
--- a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+ <%= t(".title") %> <%= current_organization_name %>
@@ -46,6 +46,6 @@
<% end %>
<% if current_user.admin_terms_accepted? %>
- <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+ <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
deleted file mode 100644
index 77839a7a15cdf..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We are contacting you to notify you that your password has been changed.
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
deleted file mode 100644
index 708edf07be4be..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to "Change my password", edit_password_url(@resource, reset_password_token: @token) %>
-
-If you did not request this, please ignore this email.
-Your password will not change until you access the link above and create a new one.
diff --git a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
index 6e05cc045575a..31d11247ac7d7 100644
--- a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
+++ b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render partial: "form", object: @form %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
index 2fab7a6d3c532..65649997871f4 100644
--- a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if current_organization.available_authorizations.empty? %>
<%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
- <%= t "decidim.admin.titles.impersonatable_users" %>
+ <%= t ".title" %>
<% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
<%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
index cce55b1bec168..ebd237dbf6062 100644
--- a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if creating_managed_user? %>
- <%= t(".impersonate_new_managed_user") %>
+ <%= t(".title") %>
<% else %>
<% if @form.user.managed? %>
<%= t(".impersonate_existing_managed_user", name: @form.user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
index bdf151be9c30f..14a53b52b2894 100644
--- a/decidim-admin/app/views/decidim/admin/imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
<%= import_manifest.message(:title, self) %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
index cbac48cb47b9e..d85d0543b147f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.admin_log" %>
+ <%= t "decidim.admin.logs.index.title" %>
<%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/index.html.erb b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
index b08e5fe4f8509..7af432ec8134f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
<%= decidim_paginate logs %>
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 c1dfb56faae16..28a5487da2c1f 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
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.impersonations" %>
+ <%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
index c890a31d0ec2a..8df79d3c485e8 100644
--- a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".new_managed_user_promotion") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
index 66599d17432ae..23891cac94b7e 100644
--- a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
- <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+ <%= t ".title", template_name: t(template_manifest.public_name_key) %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
index 362cdd1ffd248..ff6c3600f26aa 100644
--- a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t ".preview" %>
+ <%= t ".title" %>
<% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
index a190d5bed569a..c1f179dbe0460 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
-
+
- <%= t "decidim.admin.titles.participants" %>
+
+ <%= t ".title" %>
+
<%= admin_filter_selector %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..3c306de596edb 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= link_to user.email, "mailto:#{user.email}" %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
index 2ea4feeda353e..dc82f699dd6a0 100644
--- a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("title", scope: "decidim.admin.organization_external_domain_allowlist.form") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
index c6cee2d5210a3..63ab9ef2ce1ee 100644
--- a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -1,4 +1,11 @@
-
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+
+ <%= t ".title" %>
+
+
<%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
diff --git a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
index 4a789ab31623c..d34ec4631dddb 100644
--- a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.scope_types" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :scope_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
diff --git a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
index 7730666b48870..6e3f35dd52160 100644
--- a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
@@ -1,11 +1,11 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
+<% add_decidim_page_title(t(".title")) %>
<% if parent_scope %>
<%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
<% else %>
- <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
+ <%= t ".title" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
index e0b5e3b720961..4e498e12c866f 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", name: resource_title)) %>
+
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
index f099e67eb7fee..238768df7415a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
@@ -1,5 +1,3 @@
-<% add_decidim_page_title(content_blocks_title) %>
-
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
index 36d0aabb9a743..e19a0d32d8ab2 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(content_blocks_title) %>
+
<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
index 3f330918d7615..8ce44f19debee 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(content_block.public_name_key)) %>
+
<%= t content_block.public_name_key %>
diff --git a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
index 023a2d6b92fbc..bcc6f0405309c 100644
--- a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("page_topics", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
index c44814f1a7da1..6c7faa224edd4 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
+
<%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
index 7cc99a8881e32..6fe5a6a8eeb07 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("pages", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :static_page %>
<%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
index 85b867615d752..9dbec1682d5d9 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.statistics" %>
+ <%= t "decidim.admin.statistics.index.title" %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
index 209083c2d9cb2..c846c90b461a3 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render(
partial: "decidim/admin/statistics/statistics",
locals: {
diff --git a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
index f206951a7af75..9cb6426932777 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("taxonomies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.taxonomies" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_taxonomy"), new_taxonomy_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
index d4e0d04a5848d..fa0dd723d2d63 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name))) %>
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(root_taxonomy.name))) %>
- <%= t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name)) %>
+ <%= t(".title", taxonomy: translated_attribute(root_taxonomy.name)) %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_filter"), new_taxonomy_filter_path(root_taxonomy), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
index ec88de7a2a715..8d2fc0f61787d 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render "decidim/admin/taxonomy_filters_selector/taxonomies_select" %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
index 07c677b1a2def..a146049a944e5 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= button_tag class: "button button__secondary button__sm", id: "save-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
index b70d48b8c69f0..389dfd7ce688e 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= link_to decidim_admin.taxonomy_filters_selector_path(taxonomy_filter_id: taxonomy_filter.id, taxonomy_id: root_taxonomy.id, component_id: component.id), remote: true, method: :delete, class: "button button__transparent-secondary button__sm", id: "remove-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
index 56332917d60e4..e77108030c23c 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_item_path(taxonomy_id: taxonomy.id, id: taxonomy_item.id ), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
index b2a4c43a91f36..594d58931c768 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_items_path(taxonomy), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/users/index.html.erb b/decidim-admin/app/views/decidim/admin/users/index.html.erb
index 3d26b0a64acb8..3306f63c147c9 100644
--- a/decidim-admin/app/views/decidim/admin/users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.users" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :admin_user %>
<%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 0d554d179ab7e..2375605ebb12d 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -208,6 +208,9 @@ en:
user:
new: New admin
view_deleted_components: View deleted components
+ admin_terms:
+ show:
+ title: Admin terms of service
admin_terms_of_service:
accept:
error: There was a problem while accepting the admin terms of service.
@@ -221,7 +224,6 @@ en:
alert: 'Required: Review our admin terms of service'
callout: Please take a moment to review the admin terms of service. Otherwise you will not be able to manage the platform.
cta: Review them now.
- title: Admin terms of service
area_types:
create:
error: There was a problem creating a new area type.
@@ -231,6 +233,8 @@ en:
edit:
title: Edit area type
update: Update
+ index:
+ title: Area types
new:
create: Create area type
title: New area type
@@ -248,6 +252,8 @@ en:
edit:
title: Edit area
update: Update
+ index:
+ title: Areas
new:
create: Create area
title: New area
@@ -265,7 +271,7 @@ en:
title: Edit folder
update: Update
index:
- attachment_collections_title: Attachment folders
+ title: Attachment folders
new:
create: Create
title: New folder
@@ -282,7 +288,7 @@ en:
title: Edit attachment
update: Update
index:
- attachments_title: Attachments
+ title: Attachments
new:
create: Create attachment
title: New attachment
@@ -291,6 +297,9 @@ en:
success: Attachment updated successfully.
attachments_privacy_warning:
message: Be careful when working with attachments in a private space. Any participant could share this document to others.
+ authorization_workflows:
+ index:
+ title: Verification methods
autocomplete:
no_results: No results found
search_prompt: Type at least three characters to search.
@@ -335,6 +344,7 @@ en:
name: Component name
type: Component type
visibility: Visibility
+ title: Components
manage_trash:
title: Deleted components
new:
@@ -342,7 +352,6 @@ en:
title: 'Add component: %{name}'
publish:
success: The component has been successfully published.
- title: Components
unpublish:
success: The component has been successfully unpublished.
update:
@@ -354,12 +363,14 @@ en:
unpublished: Unpublished
conflicts:
attempts: Attempts
+ edit:
+ title: Transfer User
'false': 'No'
index:
text: Search by current user email, name or nickname
+ title: Verification conflicts
managed_user_name: Managed User
solved: Solved
- title: Verification conflicts
transfer:
email: Email
error: There was a problem transferring the current participant to managed participant.
@@ -392,6 +403,7 @@ en:
title: Pending Moderations
show:
dropdown: Dropdown
+ title: Dashboard
view_more_logs: View more logs
domain_allowlist:
form:
@@ -488,6 +500,8 @@ en:
form:
save: Save
success: Help sections updated successfully.
+ update:
+ title: Help sections
impersonatable_users:
index:
filter:
@@ -503,6 +517,7 @@ en:
promote: Promote
search: Search
status: Status
+ title: Manageable participants
view_logs: View logs
impersonations:
close_session:
@@ -519,7 +534,7 @@ en:
impersonate: Impersonate
impersonate_existing_managed_user: Manage participant "%{name}"
impersonate_existing_user: Manage participant "%{name}"
- impersonate_new_managed_user: Manage new participant
+ title: Impersonate participant
imports:
and: and
data_errors:
@@ -563,20 +578,25 @@ en:
participatory_space: Find participatory space
text: Search by user email, name or nickname
user: User
+ index:
+ title: Admin log
logs_list:
no_logs_yet: There are no logs yet.
no_matching_logs: There are no logs with the provided search filters. Try to change them and retry.
manage_trash:
deleted_items_warning: You are currently viewing deleted items. To make any edits or changes, you must first restore them.
managed_users:
+ impersonation_logs:
+ index:
+ title: Impersonations
promotion:
error: There was a problem promoting the managed participant.
success: The managed participant has been successfully promoted.
promotions:
new:
explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
- new_managed_user_promotion: New managed participant promotion
promote: Promote
+ title: New managed participant promotion
members:
create:
error: There was a problem adding a member for this participatory space.
@@ -805,7 +825,7 @@ en:
title: Newsletter templates
use_template: Use this template
show:
- preview: 'Preview template: %{template_name}'
+ title: 'Preview template: %{template_name}'
use_template: Use this template
newsletters:
confirm_recipients:
@@ -870,10 +890,10 @@ en:
send_to_user:
sent_successfully: Newsletter has been sent successfully to %{email}
show:
- preview: Preview
select_recipients_to_deliver: Select recipients to deliver
send_me_a_test_email: Send me a test email
subject: Subject
+ title: Preview
update:
error: There was a problem updating this newsletter.
success: Newsletter updated successfully. Please review it before sending.
@@ -907,12 +927,15 @@ en:
send_message: Send message
show_email: Show email
status: Status
+ title: Participants
unblock: Unblock
unofficialize: Unofficialize
new:
badge: Officialization badge
officialize: Officialize
title: Officialize participant "%{name}"
+ show_email:
+ title: Show email
show_email_modal:
description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
email_address: Email address
@@ -957,6 +980,7 @@ en:
success: Organization updated successfully.
organization_external_domain_allowlist:
edit:
+ title: Allowed list of external domains
update: Update
external_domain:
down: Down
@@ -965,7 +989,6 @@ en:
up: Up
form:
add: Add to allowed list
- title: Allowed list of external domains
reminders:
create:
error: There was a problem creating reminders.
@@ -974,6 +997,7 @@ en:
other: "%{count} users will be reminded."
new:
submit: Send
+ title: Send reminders
resource_permissions:
edit:
submit: Submit
@@ -991,6 +1015,8 @@ en:
edit:
title: Edit scope type
update: Update
+ index:
+ title: Scope types
new:
create: Create scope type
title: New scope type
@@ -1007,6 +1033,8 @@ en:
edit:
title: Edit scope
update: Update
+ index:
+ title: Scopes
new:
create: Create scope
title: New scope
@@ -1079,6 +1107,8 @@ en:
edit:
title: Edit topic
update: Update topic
+ index:
+ title: Topics
new:
create: New topic
title: New topic
@@ -1103,6 +1133,7 @@ en:
slug_help_html: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. Example: %{url}'
index:
last_notable_change: Last notable change
+ title: Pages
new:
create: New page
title: New page
@@ -1112,6 +1143,9 @@ en:
update:
error: There was a problem updating this page.
success: Page updated successfully.
+ statistics:
+ index:
+ title: Statistics
taxonomies:
actions:
actions: Actions
@@ -1142,6 +1176,7 @@ en:
description: Taxonomies and filters allow administrators to sort and organize content. For example, add a taxonomy with the city's districts and neighborhoods and then create filters only with the districts or for a specific neighborhood.
new_taxonomy: New taxonomy
no_items_found: No taxonomies found matching the search criteria.
+ title: Taxonomies
name: Name
new:
create: Create taxonomy
@@ -1186,6 +1221,7 @@ en:
description: A taxonomy filter allows admins to sort and filter participatory spaces based on a taxonomy. For example, add a taxonomy filter to sort processes by geographical scope.
empty: There are currently no taxonomy filters. Create a list of taxonomy filters here to sort and filter participatory spaces based on a taxonomy.
new_filter: New filter
+ title: Taxonomy filters for "%{taxonomy}"
new:
back: Back
create: Create taxonomy filter
@@ -1202,13 +1238,17 @@ en:
error: There was a problem updating this taxonomy filter.
success: Taxonomy filter updated successfully.
taxonomy_filters_selector:
+ index:
+ title: Taxonomy filters
new:
add_new_items_html: If you need to set a new filter or item, do it through the configuration settings or by clicking here.
items_count: "%{count} items"
save: Save
+ title: New taxonomy filter selector
show:
items_count: "%{count} items"
remove: Remove
+ title: Taxonomy filter selector
taxonomies_select:
filters: Filters
select_filter: Select a filter
@@ -1223,25 +1263,12 @@ en:
none: None
title: New item in %{taxonomy}
titles:
- admin_log: Admin log
- area_types: Area types
areas: Areas
authorization_workflows: Verification methods
- dashboard: Dashboard
- edit_external_domains: Allowed list of external domains
- impersonatable_users: Manageable participants
- impersonations: Participants management
menu: Menu
- page_topics: Topics
- pages: Pages
panel: Admin
- participants: Participants
- scope_types: Scope types
scopes: Scopes
statistics: Statistics
- taxonomies: Taxonomies
- taxonomy_filters: Taxonomy filters for "%{taxonomy}"
- users: Administrators
tooltips:
cannot_destroy_taxonomy_filter: Cannot destroy this taxonomy filter
cannot_edit_taxonomy_filter: Cannot edit this taxonomy filter
@@ -1265,6 +1292,8 @@ en:
email: Email
name: Name
role: Role
+ index:
+ title: Administrators
new:
create: Invite
title: Invite new administrator
@@ -1276,6 +1305,10 @@ en:
last_week: Last week
no_users_count_statistics_yet: There are no participant count statistics yet.
participants: Participants
+ components:
+ settings:
+ global:
+ taxonomy_filters_unavailable: Selecting taxonomy filters will be possible after the component is created.
forms:
errors:
impersonate_user:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index 2c6b77e359875..57a26599c651e 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "active_link_to", "~> 1.0"
s.add_dependency "decidim-core", version
- s.add_dependency "devise", "~> 4.7"
+ s.add_dependency "devise", ">= 4.7", "< 6.0"
s.add_dependency "devise-i18n", "~> 1.2"
s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
diff --git a/decidim-admin/lib/decidim/admin.rb b/decidim-admin/lib/decidim/admin.rb
index a7778ccba621b..652672dbd120a 100644
--- a/decidim-admin/lib/decidim/admin.rb
+++ b/decidim-admin/lib/decidim/admin.rb
@@ -15,8 +15,6 @@ module Admin
autoload :Import, "decidim/admin/import"
autoload :CustomImport, "decidim/admin/custom_import"
- include ActiveSupport::Configurable
-
# Public: Stores an instance of ViewHooks
def self.view_hooks
@view_hooks ||= ViewHooks.new
diff --git a/decidim-admin/lib/decidim/admin/menu.rb b/decidim-admin/lib/decidim/admin/menu.rb
index 0f92edad7f53c..011d5c7f77ccc 100644
--- a/decidim-admin/lib/decidim/admin/menu.rb
+++ b/decidim-admin/lib/decidim/admin/menu.rb
@@ -48,7 +48,7 @@ def self.register_workflows_menu!
def self.register_impersonate_menu!
Decidim.menu :impersonate_menu do |menu|
menu.add_item :conflicts,
- I18n.t("title", scope: "decidim.admin.conflicts"),
+ I18n.t("title", scope: "decidim.admin.conflicts.index"),
decidim_admin.conflicts_path,
active: is_active_link?(decidim_admin.conflicts_path),
if: allowed_to?(:index, :impersonatable_user)
diff --git a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
index 67e0ec58d1624..adbb0a5cc694b 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
@@ -53,6 +53,7 @@
fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
click_on I18n.t("decidim.admin.block_user.new.action")
+ expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
expect(content.reload).to be_hidden
diff --git a/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
new file mode 100644
index 0000000000000..dc937e285ad5c
--- /dev/null
+++ b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::HomepageContentBlockCell, type: :cell do
+ controller Decidim::Admin::OrganizationHomepageController
+
+ subject { cell("decidim/admin/homepage_content_block", content_block).call }
+
+ let(:organization) { create(:organization) }
+ let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "renders the content block name" do
+ expect(subject).to have_content("Hero image")
+ end
+
+ it "renders a link to edit the content block" do
+ expect(subject).to have_link(href: /edit/)
+ end
+
+ it "renders a link to destroy the content block" do
+ expect(subject).to have_css('a[data-method="delete"][href*="/content_blocks/"]')
+ end
+
+ it "renders the drag handle" do
+ expect(subject).to have_css("[draggable=\"true\"]")
+ end
+
+ context "when content block is not persisted" do
+ let(:content_block) { build(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "does not render edit or destroy links" do
+ expect(subject).to have_no_link(href: %r{/content_blocks/\d+/edit$})
+ expect(subject).to have_no_css('a[data-method="delete"]')
+ end
+ end
+
+ context "when content block has no settings" do
+ let(:content_block) do
+ create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage)
+ end
+
+ it "does not render edit link" do
+ expect(subject).to have_no_link(href: /edit/)
+ end
+ end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index 1ca15f31bb0c5..903dc8d24465c 100644
--- a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -45,6 +45,19 @@ module Decidim::Admin::ParticipatorySpace
expect(members.count).to eq 1
end
+ it "creates the member only one time" do
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 0
+
+ subject.call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+
+ form = double(invalid?: false, email:, current_user:, name:, role:, published: false)
+ described_class.new(form, participatory_space, via_csv:).call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+ end
+
it "creates a new user with no application admin privileges" do
subject.call
expect(Decidim::User.last).not_to be_admin
diff --git a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
index 8b263c5f5a110..0d0425c9c6fff 100644
--- a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
+++ b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
@@ -33,7 +33,7 @@ module Admin
it "breadcrumbs are set" do
get :index
- expect(controller.helpers.breadcrumb_items).to eq([label: "Taxonomies", url: taxonomies_path])
+ expect(controller.helpers.breadcrumb_items).to eq([{ label: "Taxonomies", url: taxonomies_path }])
end
end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index 2010bb0ba5548..0b64b1d7fa75a 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -55,10 +55,23 @@ def render_input
expect(form).to receive(:select).with(
:test,
full_choices,
- options
+ options, { disabled: false }
)
render_input
end
+
+ context "when the field should be disabled" do
+ let(:options) { { include_blank: false, readonly: true, label: "A test" } }
+
+ it "is supported" do
+ expect(form).to receive(:select).with(
+ :test,
+ full_choices,
+ options.except(:readonly), { disabled: true }
+ )
+ render_input
+ end
+ end
end
describe "booleans" do
@@ -188,6 +201,18 @@ def render_input
expect(view).to receive(:render).with(partial: "decidim/admin/components/taxonomy_filters_drawer")
render_input
end
+
+ context "when component is not persisted" do
+ let(:second_component) { build(:dummy_component, participatory_space: current_participatory_space) }
+
+ before do
+ view.instance_variable_set(:@component, second_component)
+ end
+
+ it "renders a message indicating that the component is missing" do
+ expect(render_input).to include("Selecting taxonomy filters will be possible after the component is created.")
+ end
+ end
end
describe "help texts" do
diff --git a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
index a72d503bfa2e1..8d22a78dd64b5 100644
--- a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
+++ b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
@@ -19,7 +19,7 @@
end
it "show Admin log panel" do
- expect(page).to have_content(t("decidim.admin.titles.admin_log"))
+ expect(page).to have_content(t("decidim.admin.logs.index.title"))
end
context "when does not have Pending moderations" do
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index ef869626cbdb4..ff67be3186ad4 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -52,5 +52,130 @@
expect(page).to have_current_path "/admin/admin_terms/show"
end
+
+ it "displays admin password requirements" do
+ visit last_email_link
+
+ expect(page).to have_content("15 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email, the organization's host")
+ expect(page).to have_content("must be different from your old passwords")
+ end
+
+ it "rejects passwords that are too short for admin" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "short123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("password is too short")
+ end
+
+ it "rejects passwords containing the user's name" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "Fiorello123456789!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("is too similar to your name")
+ end
+
+ it "rejects passwords with less than 5 unique characters" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "aaaaaaaaaaaaaaa!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("does not have enough unique characters")
+ end
+ end
+
+ context "when inviting a regular user" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+
+ let!(:invited_user) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited User",
+ email: "invited_user@example.org"
+ },
+ inviter
+ )
+ end
+ end
+
+ it "displays regular user password requirements in help text" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+
+ it "allows accepting invitation with valid user password" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "invited_user"
+ fill_in :invitation_user_password, with: "decidim123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("Your password was set successfully. You are now signed in.")
+ expect(Decidim::User.find_by(email: "invited_user@example.org")).not_to be_admin
+ end
+ end
+
+ context "when admin_password_strong is disabled" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+ let!(:invited_admin) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited Admin",
+ email: "invited_admin@example.org",
+ admin: true
+ },
+ inviter
+ )
+ end
+ end
+
+ before do
+ allow(Decidim.config).to receive(:admin_password_strong).and_return(false)
+ end
+
+ it "displays regular password requirements for admins" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+ end
+
+ context "with invalid invitation token" do
+ it "shows error for invalid token" do
+ visit "/users/invitation/accept?invitation_token=invalid_token"
+
+ expect(page).to have_content("The invitation token provided is not valid")
+ end
end
end
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index efabd2af563e4..28167accf7538 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -61,6 +61,25 @@
expect(page).to have_content("There is an error in this field.")
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization.name["ca"])
+
+ within "#organization-name-tabs" do
+ click_on "English"
+ end
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
context "when there are more than 4 locales in the organization" do
let(:available_locales) { %w(en ca es fr it) }
let(:organization_names) do
@@ -93,6 +112,23 @@
load "#{Decidim::Admin::Engine.root}/app/forms/decidim/admin/organization_form.rb"
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization_names[:ca])
+
+ select "English", from: "organization-name-tabs"
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
it "renders a dropdown for the language selector and switches between languages" do
visit decidim_admin.edit_organization_path
diff --git a/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
new file mode 100644
index 0000000000000..1fd1b638639d4
--- /dev/null
+++ b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin publishes/unpublishes content blocks" do
+ let(:organization) { create(:organization) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ end
+
+ context "when publishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+ it "shows published content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-available" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).not_to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_css("[id^=hero]")
+ end
+ end
+
+ context "when unpublishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+ let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+ it "does not show unpublished content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-actives" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_no_css("[id^=hero]")
+ end
+ end
+end
diff --git a/decidim-admin/spec/system/member_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
index 8be1fb11dfe3f..8e38f2f22e3ed 100644
--- a/decidim-admin/spec/system/member_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -30,7 +30,7 @@
context "when there are existing users" do
before do
- create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
+ create_list(:assembly_member, 3, participatory_space: assembly, organization: assembly.organization)
visit current_path
end
diff --git a/decidim-admin/spec/system/member_spec.rb b/decidim-admin/spec/system/member_spec.rb
index 2afe0b3eec5e7..06f6053943b7c 100644
--- a/decidim-admin/spec/system/member_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -8,7 +8,7 @@
let!(:user) { create(:user, :admin, :confirmed, organization:) }
let(:assembly) { create(:assembly, organization:, has_members: true) }
- let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
+ let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, organization: assembly.organization) }
before do
switch_to_host(organization.host)
diff --git a/decidim-ai/lib/decidim/ai.rb b/decidim-ai/lib/decidim/ai.rb
index 87aaf1f9d8653..18ef28036508a 100644
--- a/decidim-ai/lib/decidim/ai.rb
+++ b/decidim-ai/lib/decidim/ai.rb
@@ -7,7 +7,5 @@ module Ai
autoload :StrategyRegistry, "decidim/ai/strategy_registry"
autoload :SpamDetection, "decidim/ai/spam_detection/spam_detection"
autoload :Language, "decidim/ai/language/language"
-
- include ActiveSupport::Configurable
end
end
diff --git a/decidim-ai/lib/decidim/ai/engine.rb b/decidim-ai/lib/decidim/ai/engine.rb
index 81c0cff9a4eb7..02dcec0a4ccd0 100644
--- a/decidim-ai/lib/decidim/ai/engine.rb
+++ b/decidim-ai/lib/decidim/ai/engine.rb
@@ -117,18 +117,6 @@ class Engine < ::Rails::Engine
.perform_later(data[:resource],
data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
end
- ActiveSupport::Notifications.subscribe("decidim.proposals.create_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
- ActiveSupport::Notifications.subscribe("decidim.proposals.update_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
end
end
diff --git a/decidim-ai/lib/decidim/ai/language/language.rb b/decidim-ai/lib/decidim/ai/language/language.rb
index 6e74db26f4348..d72d165ab4236 100644
--- a/decidim-ai/lib/decidim/ai/language/language.rb
+++ b/decidim-ai/lib/decidim/ai/language/language.rb
@@ -4,7 +4,14 @@ module Decidim
module Ai
module Language
autoload :Formatter, "decidim/ai/language/formatter"
- include ActiveSupport::Configurable
+
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
# Text cleanup service
#
@@ -15,9 +22,7 @@ module Language
# # your code
# end
# end
- config_accessor :formatter do
- Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
- end
+ mattr_accessor :formatter, default: Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
end
end
end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb b/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
deleted file mode 100644
index 7a9f044de545f..0000000000000
--- a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Ai
- module SpamDetection
- module Resource
- class CollaborativeDraft < Base
- def fields = [:body, :title]
-
- protected
-
- def query = Decidim::Proposals::CollaborativeDraft.includes(:moderation)
- end
- end
- end
- end
-end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
index 61bcb72c7a0ec..80d691ce1076d 100644
--- a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
+++ b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
@@ -3,8 +3,6 @@
module Decidim
module Ai
module SpamDetection
- include ActiveSupport::Configurable
-
autoload :Service, "decidim/ai/spam_detection/service"
module Resource
@@ -13,7 +11,6 @@ module Resource
autoload :Debate, "decidim/ai/spam_detection/resource/debate"
autoload :Initiative, "decidim/ai/spam_detection/resource/initiative"
autoload :Proposal, "decidim/ai/spam_detection/resource/proposal"
- autoload :CollaborativeDraft, "decidim/ai/spam_detection/resource/collaborative_draft"
autoload :Meeting, "decidim/ai/spam_detection/resource/meeting"
autoload :UserBaseEntity, "decidim/ai/spam_detection/resource/user_base_entity"
end
@@ -28,31 +25,31 @@ module Strategy
autoload :Bayes, "decidim/ai/spam_detection/strategy/bayes"
end
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
+
# When the engine is consistently marking spam content without errors,
# you can skip human intervention by enabling this functionality
- config_accessor :hide_reported_resources_automatically do
- Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
- end
+ mattr_accessor :hide_reported_resources_automatically, default: Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
# This is the email address used by the spam engine to
# properly identify the user that will report users and content
- config_accessor :reporting_user_email do
- Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
- end
+ mattr_accessor :reporting_user_email, default: Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :resource_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :resource_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
# You can configure the spam delay for the spam detection service.
# The default value is 30 seconds
- config_accessor :spam_detection_delay do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
- end
+ mattr_accessor :spam_detection_delay, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -71,49 +68,41 @@ module Strategy
# }
# }
# }
- config_accessor :resource_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
- }
+ mattr_accessor :resource_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method. or even define own resource visibility criteria.
# This is the place where new resources can be registered following the pattern
# Resource => Handler
- config_accessor :resource_models do
- @models ||= begin
- models = {}
- models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
- models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
- models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
- models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
- models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
- models["Decidim::Proposals::CollaborativeDraft"] = "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" if Decidim.module_installed?("proposals")
- models
- end
+ mattr_accessor :resource_models
+ self.resource_models ||= begin
+ models = {}
+ models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
+ models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
+ models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
+ models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
+ models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
+ models
end
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :resource_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :resource_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :user_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :user_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -132,32 +121,24 @@ module Strategy
# }
# }
# }
- config_accessor :user_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
- }
+ mattr_accessor :user_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method or what a hidden user really is.
- config_accessor :user_models do
- {
- "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity"
- }
- end
+ mattr_accessor :user_models, default: { "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity" }
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :user_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :user_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# this is the generic resource classifier class. If you need to change your own class, please change the
# configuration of `Decidim::Ai::SpamDetection.detection_service` variable.
diff --git a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
deleted file mode 100644
index 247dd8953c591..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User creates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) { Decidim::Proposals::CreateCollaborativeDraft.new(form, author) }
-
- include_examples "Collaborative draft spam analysis"
-end
diff --git a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
deleted file mode 100644
index 563b125e174ee..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User updates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) do
- Decidim::Proposals::UpdateCollaborativeDraft.new(form, author, collaborative_draft)
- end
-
- include_examples "Collaborative draft spam analysis" do
- let!(:collaborative_draft) do
- create(:collaborative_draft,
- component:,
- users: [author],
- title: "Some draft that is not blocked",
- body: "The body for the proposal.")
- end
- end
-end
diff --git a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
index 0cb1ddaf4fd1a..9b2eab63a0d89 100644
--- a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
+++ b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
@@ -103,18 +103,6 @@
include_examples "some resources are being spam"
end
- context "when trained model is Decidim::Proposals::CollaborativeDraft" do
- let(:manifest_name) { "proposals" }
- let(:training) { 8 }
-
- let!(:reportable) { create(:collaborative_draft, component:, users: [author], title: "Hidden resource") }
- let!(:resources) { create_list(:collaborative_draft, 3, component:, users: [author]) }
- let(:resource_models) { { "Decidim::Proposals::CollaborativeDraft" => "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" } }
-
- include_examples "resource is being indexed"
- include_examples "some resources are being spam"
- end
-
context "when trained model is Decidim::Debates::Debate" do
let(:manifest_name) { "debates" }
let(:training) { 8 }
diff --git a/decidim-ai/spec/shared/events_examples.rb b/decidim-ai/spec/shared/events_examples.rb
index 6cdfc2df6d30b..c90dd5d4fc5da 100644
--- a/decidim-ai/spec/shared/events_examples.rb
+++ b/decidim-ai/spec/shared/events_examples.rb
@@ -172,7 +172,7 @@
context "when regular content is added" do
let(:description) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -200,7 +200,7 @@
context "when regular content is added" do
let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -210,31 +210,3 @@
end
end
end
-
-shared_examples "Collaborative draft spam analysis" do
- context "when spam content is added" do
- let(:body) { "Claim your prize today so you can win." }
- let(:title) { "You are the Lucky winner" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 1 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-
- context "when regular content is added" do
- let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 0 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-end
diff --git a/decidim-api/app/controllers/decidim/api/sessions_controller.rb b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
index 97011840cf0bd..6299128062f1c 100644
--- a/decidim-api/app/controllers/decidim/api/sessions_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
@@ -45,7 +45,7 @@ def respond_with(resource, _opts = {})
render json: serialized_user.merge("avatar" => nil)
end
- def respond_to_on_destroy
+ def respond_to_on_destroy(*)
head :ok
end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 479b5af792aa2..3adeff8e3035b 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
end
s.add_dependency "decidim-core", version
- s.add_dependency "devise-jwt", "~> 0.12.1"
+ s.add_dependency "devise-jwt", ">= 0.12.1", "< 0.14.0"
s.add_dependency "graphql", ">= 2.4.17", "< 2.6"
- s.add_dependency "graphql-docs", "~> 5.0"
- s.add_dependency "rack-cors", "~> 1.0"
+ s.add_dependency "graphql-docs", ">= 5", "< 7"
+ s.add_dependency "rack-cors", ">= 1", "< 4"
s.add_development_dependency "decidim-assemblies", version
s.add_development_dependency "decidim-comments", version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 11f9beec80ec2..632f18eb5e53e 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -11,54 +11,44 @@ module Decidim
# This module holds all business logic related to exposing a Public API for
# decidim.
module Api
- include ActiveSupport::Configurable
+ class << self
+ def config = self
- # defines the schema max_per_page to configure GraphQL pagination
- config_accessor :schema_max_per_page do
- Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+ def configure
+ yield self
+ end
end
+ # defines the schema max_per_page to configure GraphQL pagination
+ mattr_accessor :schema_max_per_page, default: Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+
# defines the schema max_complexity to configure GraphQL query complexity
- config_accessor :schema_max_complexity do
- Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
- end
+ mattr_accessor :schema_max_complexity, default: Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
# defines how many aliases are permitted in a query
- config_accessor :max_aliases do
- Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
- end
+ mattr_accessor :max_aliases, default: Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
# defines the schema max_depth to configure GraphQL query max_depth
- config_accessor :schema_max_depth do
- Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- end
+ mattr_accessor :schema_max_depth, default: Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- config_accessor :disclose_system_version do
- Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
- end
+ mattr_accessor :disclose_system_version, default: Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
# makes the API authentication necessary in order to access it
# access it.
- config_accessor :force_api_authentication do
- Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
- end
+ mattr_accessor :force_api_authentication, default: Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
# allows anonymous introspection queries
# If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
# Otherwise, anyone can access it, causing security issues.
- config_accessor :enable_anonymous_introspection do
- Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
- end
+ mattr_accessor :enable_anonymous_introspection, default: Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
# The expiration time of the JWT tokens, after which issued token will
# expire. Recommended to match the value of
# `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
- config_accessor :jwt_expires_in do
- Decidim::Env.new(
- "DECIDIM_API_JWT_EXPIRES_IN",
- Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
- ).to_i
- end
+ mattr_accessor :jwt_expires_in, default: Decidim::Env.new(
+ "DECIDIM_API_JWT_EXPIRES_IN",
+ Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
+ ).to_i
# This declares all the types an interface or union can resolve to. This needs
# to be done in order to be able to have them found. This is a shortcoming of
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index 8a45ea3178273..af78fe6474a65 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when creating a new assembly
# in the system.
class CreateAssembly < Decidim::Commands::CreateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
:promoted, :taxonomizations, :parent, :organization,
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 3042adeeded07..901f911460d51 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -63,7 +63,7 @@ def duplicate_assembly
end
def duplicate_assembly_attachments
- [:hero_image, :banner_image].each do |attribute|
+ [:hero_image].each do |attribute|
next unless @assembly.attached_uploader(attribute).attached?
@duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index e91d4df267451..5747fa541ca5e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when updating a new assembly
# in the system.
class UpdateAssembly < Decidim::Commands::UpdateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
:taxonomizations, :parent, :private_space, :developer_group, :local_area,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
index 0c0d4f6753e0d..9bafd2fcb00b2 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -37,7 +37,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
@@ -63,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
- render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+ render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
index e5e6fcf6d2299..012fa88b7f97a 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
@@ -25,7 +25,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index f453269c3876e..d6b4bcc7cc644 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
index 31b07defed14e..afb1fd8012218 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
@@ -19,6 +19,7 @@ module AssemblyAdmin
included do
include Decidim::Admin::ParticipatorySpaceAdminContext
+
helper_method :current_assembly
add_breadcrumb_item_from_menu :admin_assembly_menu
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 5ab89729e7c4a..cbbfd81cf55d5 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -54,9 +54,7 @@ class AssemblyForm < Form
attribute :duration, Decidim::Attributes::LocalizedDate
attribute :included_at, Decidim::Attributes::LocalizedDate
- attribute :banner_image
attribute :hero_image
- attribute :remove_banner_image, Boolean, default: false
attribute :remove_hero_image, Boolean, default: false
validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,7 +67,6 @@ class AssemblyForm < Form
validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
validates :title, :subtitle, :description, :short_description, translatable_presence: true
- validates :banner_image, passthru: { to: Decidim::Assembly }
validates :hero_image, passthru: { to: Decidim::Assembly }
validates :weight, presence: true
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 208cc845bae6b..eaacc4dec64a8 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -71,9 +71,6 @@ class Assembly < ApplicationRecord
has_one_attached :hero_image
validates_upload :hero_image, uploader: Decidim::HeroImageUploader
- has_one_attached :banner_image
- validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
validates :slug, uniqueness: { scope: :organization }
validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 0629e11cc3264..dded25d18a7ea 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
-
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
-
-
-
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
index 8ef195373f662..2dd8a49aa4c97 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
@@ -50,10 +50,6 @@ export default class extends Controller {
if (isTransparentCheckbox) {
isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-
- if (isTransparentCheckbox.checked) {
- isTransparentCheckbox.checked = false;
- }
}
if (specialFeatures) {
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
index 024b0b10455f1..ed8f5f43512c5 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
@@ -9,10 +9,6 @@ def hero_image_url
assembly.attached_uploader(:hero_image).url
end
- def banner_image_url
- assembly.attached_uploader(:banner_image).url
- end
-
def area_name
return if assembly.area.blank?
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 35be379dc5886..8779856149558 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -42,7 +42,7 @@ def query
def assemblies_user_admins
Decidim::User.where(
id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
- .select(:decidim_user_id)
+ .select(:decidim_user_id)
)
end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index b0b825f029a1f..28900d7a89b9c 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -60,8 +60,6 @@ def import(attributes, _user, opts)
meta_scope: attributes["meta_scope"]
)
import_hero_image(attributes["remote_hero_image_url"])
- import_banner_image(attributes["remote_banner_image_url"])
-
@imported_assembly.save!
@imported_assembly
end
@@ -84,27 +82,24 @@ def import_folders_and_attachments(attachments)
next
end
- begin
- file_tmp = URI.parse(url).open
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t(
- "decidim.assemblies.admin.imports.attachment_error",
- title: attachment_title(file),
- error: format_error(e)
- )
- next
- end
-
Decidim.traceability.perform_action!("create", Attachment, @user) do
attachment = Attachment.new(
title: file["title"],
description: file["description"],
- content_type: file_tmp.content_type,
attached_to: @imported_assembly,
- weight: file["weight"],
- file: file_tmp, # Define attached_to before this
- file_size: file_tmp.size
+ weight: file["weight"]
)
+ begin
+ attachment.attached_uploader(:file).remote_url = url
+ attachment.set_content_type_and_size
+ rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+ @warnings << I18n.t(
+ "decidim.assemblies.admin.imports.attachment_error",
+ title: attachment_title(file),
+ error: format_error(e)
+ )
+ next
+ end
attachment.create_attachment_collection(file["attachment_collection"])
attachment.save!
attachment
@@ -180,14 +175,6 @@ def import_hero_image(url)
@warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
end
- def import_banner_image(url)
- return if url.blank?
-
- @imported_assembly.attached_uploader(:banner_image).remote_url = url
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
- end
-
def format_error(error)
return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
index a6dcfb2f4c0f5..4a5b77bb6aad2 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
@@ -12,7 +12,6 @@ def serialize
url: EngineRouter.main_proxy(resource).assembly_url(resource),
subtitle: resource.subtitle,
remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
- remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
developer_group: resource.developer_group,
local_area: resource.local_area,
meta_scope: resource.meta_scope,
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 861ca7914d867..e176aa7db01cd 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -98,10 +98,6 @@
<%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
-
-
- <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
index d6ed716e4f028..41801f6c9ac24 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index faa12dc4037a2..f8aa07760af84 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if parent_assembly && parent_assembly.self_and_ancestors.length %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
index 41626d1357ee0..1434001b85107 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
@@ -6,7 +6,7 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
);
// Dispatch the `ajax:loaded` event with the newly inserted element
-const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+var insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
var component = new window.Decidim.AdminAssembliesListComponent();
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
index f98ba34f2a9bc..097a30bc1b2f3 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
index d08339df210cd..95e2ade99b9dc 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.new.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
index 18f2eca3dc5c9..dea867b78ac4e 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index b5d593aa340de..f54582cc75785 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
index 45d96fe525a54..b271eed7173f4 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
index aad6260fb5fcd..1afef5e5df6e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :assembly_user_role %>
<%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
index 570517cea9aa0..765c729002a52 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 3fb3b7d068099..6bafa56d3e0ce 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
<% add_decidim_meta_tags(
title: translated_attribute(current_participatory_space.title),
resource: current_participatory_space) %>
@@ -11,13 +11,14 @@ edit_link(
)
%>
-<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
-
-
- <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
- <%= collection.size %>
-
-
+<% content_for :aside do %>
+
+ <%= t("members", scope: "decidim.participatory_space_members.index") %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
<%= render(collection) %>
-
-
+
+<% end %>
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 9e01c707a6196..cd68e71cb2001 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -107,11 +107,8 @@ en:
public: Public
published: Published
unpublished: Unpublished
- manage_trash:
- title: Deleted assemblies
new:
create: Create
- title: New assembly
update:
error: There was a problem updating this assembly.
success: Assembly successfully updated.
@@ -123,7 +120,6 @@ en:
new:
duplicate: Duplicate
select: Select which data you would like to duplicate
- title: Duplicate assembly
assembly_imports:
create:
error: There was a problem importing this assembly.
@@ -131,7 +127,6 @@ en:
new:
import: Import
select: Select which data you would like to import
- title: Import assembly
assembly_publications:
create:
error: There was a problem publishing this assembly.
@@ -146,13 +141,9 @@ en:
destroy:
success: Admin successfully removed from this assembly.
edit:
- title: Update assembly admin
update: Update
- index:
- assembly_admins_title: Assembly admins
new:
create: Create
- title: New assembly admin
update:
error: There was a problem updating an admin for this assembly.
success: Admin updated successfully for this assembly.
@@ -210,8 +201,6 @@ en:
space_filter_for:
assemblies: All assemblies
titles:
- assemblies: Assemblies
- assemblies_deleted: Deleted assemblies
assemblies_types: Assemblies types
tooltips:
deleted_assemblies_info: An assembly can only be deleted if status is "Unpublished".
@@ -247,6 +236,8 @@ en:
assemblies:
admin:
assemblies:
+ edit:
+ title: About this assembly
form:
define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
duration: Duration
@@ -265,24 +256,40 @@ en:
taxonomies: Taxonomies
title: General Information
visibility: Visibility
+ index:
+ title: Assemblies
+ manage_trash:
+ title: Deleted assemblies
+ new:
+ title: New assembly
assembly_duplicates:
form:
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Duplicate assembly
assembly_imports:
form:
document_legend: Add a document
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Import assembly
assembly_members:
form:
explanation: 'Guidance for image:'
image_guide: Preferably a portrait image that does not have any text.
non_user_avatar_help: You should get the consent of the persons before publishing them as a member.
+ assembly_user_roles:
+ edit:
+ title: Update assembly admin
+ index:
+ title: Assembly admins
+ new:
+ title: New assembly admin
content_blocks:
highlighted_assemblies:
max_results: Maximum amount of elements to show
imports:
attachment_error: The attachment "%{title}" could not be imported (%{error}).
- banner_image_error: The banner image could not be imported (%{error}).
hero_image_error: The hero image could not be imported (%{error}).
new_import:
accepted_types:
@@ -311,9 +318,6 @@ en:
type: Type
show:
title: About this assembly
- assembly_members:
- index:
- members: Members
content_blocks:
children_assemblies:
name: Assemblies
@@ -355,9 +359,6 @@ en:
duration: Duration
private_space: This is a private assembly
social_networks_title: Visit assembly on
- assembly_members:
- index:
- title: Members
download_your_data:
show:
assemblies: Assemblies export
diff --git a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
index f5dbd012845c8..063ce22662adc 100644
--- a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
+++ b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
@@ -7,10 +7,10 @@ def change
# required so that test suite works in ci env
enable_extension "ltree"
rescue StandardError
- raise <<-MSG.squish
- Decidim requires the ltree extension to be enabled in your PostgreSQL.
- You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
- super user.
+ raise <<~MSG.squish
+ Decidim requires the ltree extension to be enabled in your PostgreSQL.
+ You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+ super user.
MSG
end
end
diff --git a/decidim-assemblies/lib/decidim/api/assembly_type.rb b/decidim-assemblies/lib/decidim/api/assembly_type.rb
index 1405d7e2aec10..5205f6f7cecab 100644
--- a/decidim-assemblies/lib/decidim/api/assembly_type.rb
+++ b/decidim-assemblies/lib/decidim/api/assembly_type.rb
@@ -17,7 +17,6 @@ class AssemblyType < Decidim::Api::Types::BaseObject
description "An assembly"
- field :banner_image, String, "The banner image for this assembly", null: true
field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
field :children_count, Integer, "Number of children assemblies", null: true
field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
@@ -64,10 +63,6 @@ def url
def hero_image
object.attached_uploader(:hero_image).url
end
-
- def banner_image
- object.attached_uploader(:banner_image).url
- end
end
end
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ebd08fba721d4..2f20677f1623e 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -42,13 +42,12 @@ class Engine < ::Rails::Engine
end
get "/assemblies", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies"
}
get "/assemblies/*rest", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
-
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies/#{params[:rest]}"
}
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/seeds.rb b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
index 4667312ad2f4a..4900aa839bd20 100644
--- a/decidim-assemblies/lib/decidim/assemblies/seeds.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
@@ -60,7 +60,6 @@ def create_assembly!(parent: nil)
end,
organization:,
hero_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? hero_image : nil, # Keep after organization
- banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
promoted: true,
published_at: 2.weeks.ago,
meta_scope: Decidim::Faker::Localized.word,
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index cefe5ad3d9a55..b46807b899ffc 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -27,7 +27,6 @@
description { generate_localized_description(:assembly_description, skip_injection:) }
organization
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
- banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
published_at { Time.current }
deleted_at { nil }
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index 5b175f3ee64f9..e4952a91aa401 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -18,7 +18,6 @@ module Decidim::Assemblies
end
let(:related_process_ids) { [participatory_processes.map(&:id)] }
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:taxonomizations) do
2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
end
@@ -34,7 +33,6 @@ module Decidim::Assemblies
slug: "slug",
meta_scope: { en: "meta scope" },
hero_image:,
- banner_image:,
promoted: nil,
developer_group: { en: "developer group" },
local_area: { en: "local" },
@@ -87,7 +85,6 @@ module Decidim::Assemblies
content_type: "image/jpeg"
)
end
- let(:banner_image) { hero_image }
before do
allow(Decidim::ActionLogger).to receive(:log).and_return(true)
@@ -99,7 +96,6 @@ module Decidim::Assemblies
it "adds errors to the form" do
expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
- expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
subject.call
end
end
@@ -112,14 +108,12 @@ module Decidim::Assemblies
content_type: "image/png"
)
end
- let(:banner_image) { nil }
let(:form) do
Admin::AssemblyForm.from_params(
title: { en: "title" },
subtitle: { en: "subtitle" },
slug: "slug",
hero_image:,
- banner_image:,
description: { en: "description" },
short_description: { en: "short_description" },
organization:
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..ee9b46ea875d5 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -44,10 +44,6 @@ def stub_calls_to_external_files
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 384d61f6e9732..0af3499198faa 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
2.times.map { create(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: my_assembly) }
end
let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
- let(:banner_image) { my_assembly.banner_image }
let(:params) do
{
assembly: {
@@ -69,8 +68,7 @@ module Decidim::Assemblies
end
let(:attachment_params) do
{
- hero_image: hero_image.blob,
- banner_image: banner_image.blob
+ hero_image: hero_image.blob
}
end
let(:context) do
@@ -105,7 +103,6 @@ module Decidim::Assemblies
context "when the uploaded hero image has too large dimensions" do
let(:attachment_params) do
{
- banner_image: banner_image.blob,
hero_image: ActiveStorage::Blob.create_and_upload!(
io: File.open(Decidim::Dev.asset("5000x5000.png")),
filename: "5000x5000.png",
@@ -125,7 +122,6 @@ module Decidim::Assemblies
allow(form).to receive(:invalid?).and_return(false)
expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
my_assembly.errors.add(:hero_image, "File resolution is too large")
- my_assembly.errors.add(:banner_image, "File resolution is too large")
end
it "broadcasts invalid" do
@@ -136,7 +132,6 @@ module Decidim::Assemblies
command.call
expect(form.errors[:hero_image]).not_to be_empty
- expect(form.errors[:banner_image]).not_to be_empty
end
end
@@ -176,14 +171,12 @@ module Decidim::Assemblies
expect(linked_participatory_processes).to match_array(participatory_processes)
end
- context "when homepage image is not updated" do
+ context "when hero image is not updated" do
let(:attachment_params) do
- {
- banner_image: banner_image.blob
- }
+ {}
end
- it "does not replace the homepage image" do
+ it "does not replace the hero image" do
expect(my_assembly).not_to receive(:hero_image=)
command.call
@@ -193,23 +186,6 @@ module Decidim::Assemblies
end
end
- context "when banner image is not updated" do
- let(:attachment_params) do
- {
- hero_image: hero_image.blob
- }
- end
-
- it "does not replace the banner image" do
- expect(my_assembly).not_to receive(:banner_image=)
-
- command.call
- my_assembly.reload
-
- expect(my_assembly.banner_image).to be_present
- end
- end
-
context "when updating the parent assembly" do
let!(:parent_assembly) { create(:assembly, organization:) }
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index cb707515ee6db..6b37e015f9025 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -120,7 +120,6 @@ module Admin
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
"hero_image" => attachment,
- "banner_image" => attachment,
"slug" => slug,
"private_space" => private_space,
"has_members" => has_members,
@@ -185,7 +184,7 @@ module Admin
it { is_expected.not_to be_valid }
end
- context "when attachment (hero_image or banner_image) is too big" do
+ context "when attachment (hero_image) is too big" do
before do
organization.settings.tap do |settings|
settings.upload.maximum_file_size.default = 5
@@ -298,7 +297,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
@@ -351,7 +349,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index e4e50af28d4ad..dc43eac7cab3d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -12,26 +12,17 @@ module Decidim
describe "when no images were uploaded" do
before do
assembly.hero_image.purge
- assembly.banner_image.purge
end
it "return nil for hero_image_url" do
expect(subject.hero_image_url).to be_nil
end
-
- it "return nil for banner_image_url" do
- expect(subject.banner_image_url).to be_nil
- end
end
describe "when images are attached" do
it "resolves hero_image_url" do
expect(subject.hero_image_url).to be_blob_url(assembly.hero_image.blob)
end
-
- it "resolves banner_image_url" do
- expect(subject.banner_image_url).to be_blob_url(assembly.banner_image.blob)
- end
end
end
end
diff --git a/decidim-assemblies/spec/requests/redirect_routes_spec.rb b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
new file mode 100644
index 0000000000000..ad28fe824faf9
--- /dev/null
+++ b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Redirect routes" do
+ let(:organization) { create(:organization, available_locales: %w(en es ca), default_locale: "en") }
+ let(:headers) { { "HOST" => organization.host } }
+
+ it "redirects old url with missing locale" do
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale" do
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+
+ it "redirects to default locale when the locale is invalid" do
+ get("/assemblies?locale=esp", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale and additional params" do
+ get("/assemblies/foo-bar?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies/foo-bar")
+ end
+
+ it "redirects user to the new url" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/ca/assemblies")
+ end
+
+ it "redirects user to the new url when using custom locale" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index f7c15cbab8bc3..50e7761e4d336 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -51,12 +51,10 @@ module Decidim::Assemblies
"created_by" => "citizens",
"meta_scope" => Decidim::Faker::Localized.sentence(word_count: 3),
"announcement" => Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title },
- "remote_hero_image_url" => hero_image_url,
- "remote_banner_image_url" => banner_image_url
+ "remote_hero_image_url" => hero_image_url
}
end
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly correctly" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
@@ -139,95 +137,22 @@ module Decidim::Assemblies
end
end
- context "when banner image URL is present and accessible" do
- let(:banner_image_url) { "http://example.com/banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, banner_image_url)
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
- end
-
- it "imports the assembly with the banner image" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- expect(subject.banner_image).to be_attached
- end
-
- it "has no warnings" do
- subject
- expect(importer.warnings).to be_empty
- end
- end
-
- context "when banner image URL returns 404 error" do
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "does not attach the banner image" do
- subject
- expect(subject.banner_image).not_to be_attached
- end
-
- it "collects a warning about the missing banner image" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported \(404 Not Found\)\./i))
- end
- end
-
- context "when both hero and banner images fail to import" do
- let(:hero_image_url) { "http://example.com/missing-hero.jpg" }
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, hero_image_url).to_return(status: 404)
- stub_request(:head, hero_image_url).to_return(status: 404)
- stub_request(:get, banner_image_url).to_return(status: 500)
- stub_request(:head, banner_image_url).to_return(status: 500)
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "collects warnings for both images" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The hero image could not be imported/i))
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported/i))
- expect(importer.warnings.length).to eq(2)
- end
- end
-
context "when image URL is nil" do
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
context "when image URL is empty string" do
let(:hero_image_url) { "" }
- let(:banner_image_url) { "" }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
@@ -311,6 +236,114 @@ module Decidim::Assemblies
expect(importer.warnings).to include(a_string_matching(/The attachment "Test File" could not be imported \(500 Internal Server Error\)\./i))
end
end
+
+ context "when remote file is accessible and downloadable (PDF)" do
+ let(:remote_file_url) { "http://example.com/document.pdf" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ expect(attachment.file.filename.to_s).to eq("document.pdf")
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("application/pdf")
+ end
+
+ it "sets the file size automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file_size).to be_present
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file is accessible and downloadable (image)" do
+ let(:remote_file_url) { "http://example.com/image.jpg" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("image/jpeg")
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file URL is blank" do
+ let(:attachments_data) do
+ {
+ "files" => [
+ {
+ "title" => { "en" => "Test File" },
+ "description" => { "en" => "Test Description" },
+ "weight" => 1,
+ "remote_file_url" => ""
+ }
+ ],
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
+
+ context "when files array is nil" do
+ let(:attachments_data) do
+ {
+ "files" => nil,
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
end
end
end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 57ec9cb121f86..2577d2432fb03 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
index 9d07c6c3d027c..baee2322438b5 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
@@ -23,7 +23,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index c4a4409979ba0..c98bd31acad1e 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -18,7 +18,7 @@
it "updates an assembly" do
fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
- dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
+ dynamically_attach_file(:assembly_hero_image, image3_path, remove_before: true)
within ".edit_assembly" do
expect(assembly_parent_id_options).not_to include(assembly.id)
@@ -84,12 +84,6 @@
src = page.find("img")["src"]
expect(src).to be_blob_url(hero_blob)
end
-
- banner_blob = assembly.hero_image.blob
- within %([data-active-uploads] [data-filename="#{banner_blob.filename}"]) do
- src = page.find("img")["src"]
- expect(src).to be_blob_url(banner_blob)
- end
end
end
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index f365f2fb79242..8d59e9521f705 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -29,10 +29,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
@@ -115,10 +111,6 @@
.to_return(status: 404, body: "Not Found")
stub_request(:head, "http://example.com/missing-hero.jpg")
.to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
within_admin_menu do
click_on "Import"
@@ -149,115 +141,7 @@
end
end
- context "when banner image URL returns 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 banner",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-banner"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows a warning about the missing banner image" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 banner")
-
- within ".flash.warning" do
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both hero and banner image URLs return 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_hero_image_url"] = "http://example.com/missing-hero.jpg"
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 images",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-both"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows warnings for both missing images" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 images")
-
- within ".flash.warning" do
- expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both image URLs are too long and return 404" do
+ context "when hero image URL is too long and returns 404" do
let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
let(:json_file) do
Tempfile.new(["assemblies", ".json"]).tap do |file|
@@ -269,20 +153,14 @@
Rack::Test::UploadedFile.new(json_file.path, "application/json")
end
let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
- let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
before do
json_data.first["remote_hero_image_url"] = hero_image_url
- json_data.first["remote_banner_image_url"] = banner_image_url
stub_request(:get, hero_image_url)
.to_return(status: 404, body: "Not Found")
stub_request(:head, hero_image_url)
.to_return(status: 404, body: "Not Found")
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
within_admin_menu do
click_on "Import"
@@ -303,13 +181,12 @@
click_on "Import"
end
- it "imports successfully and shows warnings for both missing images" do
+ it "imports successfully and shows warnings for missing hero image" do
expect(page).to have_callout("Assembly successfully imported.")
expect(page).to have_callout("Import assembly with long 404 images")
within ".flash.warning" do
expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
end
end
end
@@ -338,10 +215,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
within_admin_menu do
click_on "Import"
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 9e945e03285ca..e23ed6837013a 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -86,7 +86,6 @@
end
dynamically_attach_file(:assembly_hero_image, image1_path)
- dynamically_attach_file(:assembly_banner_image, image2_path)
within ".new_assembly" do
find("*[type=submit]").click
@@ -111,15 +110,11 @@
visit decidim_admin_assemblies.assemblies_path
end
- it "update a participatory process without images does not delete them" do
+ it "update an assembly without images does not delete them" do
within "tr", text: translated(assembly3.title) do
click_on translated(assembly3.title)
end
- within_admin_sidebar_menu do
- click_on "About this assembly"
- end
-
select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
click_on "Update"
@@ -135,6 +130,18 @@
expect(src).to be_blob_url(hero_blob)
end
end
+
+ describe "when the assembly is transparent" do
+ let!(:assembly3) { create(:assembly, :private, :transparent, organization:) }
+
+ it "shows the transparent checkbox correctly" do
+ within "tr", text: translated(assembly3.title) do
+ click_on translated(assembly3.title)
+ end
+
+ expect(page).to have_checked_field("assembly_is_transparent")
+ end
+ end
end
context "when managing parent assemblies" do
@@ -195,4 +202,61 @@
end
end
end
+
+ context "when navigating grandchild assemblies (3rd level)" do
+ let!(:grandmother_assembly) { create(:assembly, organization:) }
+ let!(:mother_assembly) { create(:assembly, organization:, parent: grandmother_assembly) }
+ let!(:child_assembly) { create(:assembly, :with_content_blocks, organization:, parent: mother_assembly) }
+ let(:assembly) { child_assembly }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ visit decidim_admin_assemblies.assemblies_path
+ end
+
+ describe "listing grandchild assemblies" do
+ it "expands both parent and grandparent assemblies to show child" do
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(child_assembly.title))
+
+ # Opens actions dropdown in child
+ find("button[data-target='actions-assembly-#{child_assembly.id}']").click
+ expect(page).to have_content("Edit")
+ expect(page).to have_content("Share link")
+ expect(page).to have_content("Export")
+
+ # Collapse mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(child_assembly.title))
+ expect(page).to have_content(translated(mother_assembly.title))
+
+ # Collapse grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+ end
+ end
+ end
end
diff --git a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
index a52d4aaefbcf5..1749135152554 100644
--- a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
@@ -5,12 +5,11 @@
describe "Social shares" do
let(:organization) { create(:organization) }
- let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:, banner_image:) }
+ let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:) }
let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
let!(:attachment) { create(:attachment, :with_image, attached_to: assembly, file: attachment_file) }
let(:description) { { en: "Description
" } }
let(:short_description) { { en: "Description
" } }
- let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
@@ -44,19 +43,11 @@
context "when no hero_image" do
let(:hero_image) { nil }
- it_behaves_like "a social share meta tag", "city.jpeg"
- end
-
- context "when no direct images" do
- let(:hero_image) { nil }
- let(:banner_image) { nil }
-
it_behaves_like "a social share meta tag", "city3.jpeg"
end
context "when no attachments nor direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
it_behaves_like "a social share meta tag", "description_image.jpg"
@@ -70,7 +61,6 @@
context "when no attachments, description image or direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
@@ -80,7 +70,6 @@
context "when nothing" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index a59648ec90844..c197eb01dd68c 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -83,14 +83,6 @@ module Assemblies
end
end
- describe "bannerImage" do
- let(:query) { "{ bannerImage }" }
-
- it "returns the banner image field" do
- expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
- end
- end
-
describe "promoted" do
let(:query) { "{ promoted }" }
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 506a9bf3b697c..fdedb5a24c0fb 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -77,7 +77,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -200,7 +199,6 @@
it "returns the correct response" do
data = response["assemblies"].first
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
@@ -231,7 +229,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -344,7 +341,6 @@
it "returns the correct response" do
data = response["assembly"]
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index dea863457fd7f..0af90d0f23945 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -26,7 +26,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +48,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index aeffda5c91004..3a7aecce62871 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -36,7 +36,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -58,7 +58,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
@@ -97,11 +97,8 @@ def posts
end
end
- # PROVISIONAL if we implement counter cache
def posts_most_commented
- @posts_most_commented ||= posts.joins(:comments).group(:id)
- .select("count(decidim_comments_comments.id) as counter")
- .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
+ @posts_most_commented ||= posts.order(comments_count: :desc).published_at_desc.limit(7)
end
def add_breadcrumb_item
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 38c74550bb540..c1c1801729431 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -38,7 +38,7 @@ class Post < Blogs::ApplicationRecord
D: :body,
datetime: :created_at
},
- index_on_create: true,
+ index_on_create: ->(post) { post.visible? },
index_on_update: ->(post) { post.visible? })
class << self
diff --git a/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
new file mode 100644
index 0000000000000..322bc8361847d
--- /dev/null
+++ b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages component publication" do
+ include_context "when managing a component as an admin" do
+ let!(:resource) { create(:post, :published, component:) }
+
+ context "when cycling through publication states" do
+ let!(:component) { create(:post_component, participatory_space:) }
+
+ include_examples "cycling through publication states"
+ end
+
+ context "when component is unpublished, and admin publishes" do
+ let!(:component) { create(:post_component, :unpublished, participatory_space:) }
+
+ include_examples "add component resources to search index"
+ end
+
+ context "when component is published, and admin unpublishes" do
+ let!(:component) { create(:post_component, :published, participatory_space:) }
+
+ include_examples "removes component resources from search index"
+ end
+ end
+end
diff --git a/decidim-blogs/spec/system/admin_publishes_component_spec.rb b/decidim-blogs/spec/system/admin_publishes_component_spec.rb
deleted file mode 100644
index 734951b434d63..0000000000000
--- a/decidim-blogs/spec/system/admin_publishes_component_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin publishes component" do
- let(:manifest_name) { "blogs" }
- let!(:resource) { create(:post, component:) }
-
- include_context "when publishing and unpublishing the component"
- include_context "when cycling through publication states"
-end
diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
index e5f196d91df65..5167807fcb88a 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
@@ -35,7 +35,8 @@ def progress_budgets
end
def non_voted_budgets
- budgets.where.not(id: voted.map(&:id))
+ budgets_to_exclude = progress_budgets + voted
+ budgets.where.not(id: budgets_to_exclude.map(&:id))
end
def highlighted?
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..bd80489593723 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class CreateProject < Decidim::Commands::CreateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..522afcf3e0697 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class UpdateProject < Decidim::Commands::UpdateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
def initialize(form, project)
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
index 41dc4fcfe8b1b..a2f334d877695 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
@@ -6,6 +6,7 @@ module Admin
# This controller allows the create or update a budget.
class BudgetsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
+
helper_method :budgets, :budget, :finished_orders, :pending_orders,
:users_with_pending_orders, :users_with_finished_orders
@@ -26,7 +27,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +49,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 7eb5bd00861e6..e45f48995522a 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
include Decidim::Admin::ComponentTaxonomiesHelper
include Decidim::Budgets::Admin::Filterable
+
helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
helper Decidim::Budgets::ProjectsHelper
@@ -39,7 +40,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -62,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
index 22d03155470d7..a60f8ebcf6a9e 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
index 8b4b94a8342bb..dca3242383a8f 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
@@ -22,12 +22,12 @@ def create
AddLineItem.call(persisted_current_order, project, current_user) do
on(:ok) do |order|
self.current_order = order
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
@@ -38,12 +38,12 @@ def destroy
respond_to do |format|
RemoveLineItem.call(current_order, project) do
on(:ok) do |_order|
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 4918e044c4329..eb4b8f4425d82 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -16,7 +16,7 @@ class BudgetForm < Decidim::Form
validates :title, translatable_presence: true
validates :weight, numericality: { greater_than_or_equal_to: 0 }
- validates :total_budget, numericality: { greater_than: 0 }
+ validates :total_budget, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 339ab98e8968f..530e4099dac94 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -26,7 +26,7 @@ class ProjectForm < Decidim::Form
validates :title, translatable_presence: true
validates :description, translatable_presence: true
- validates :budget_amount, presence: true, numericality: { greater_than: 0 }
+ validates :budget_amount, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
validate :notify_missing_attachment_if_errored
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 9990eab6dddcb..e5dcb4b0015a9 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -134,14 +134,14 @@ def attachment_context
end
ransacker :confirmed_orders_count do
- query = <<-SQL.squish
- (
- SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
- FROM decidim_budgets_line_items
- LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
- WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
- AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
- )
+ query = <<~SQL.squish
+ (
+ SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+ FROM decidim_budgets_line_items
+ LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+ WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+ AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+ )
SQL
Arel.sql(query)
end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
index 70bf4c4dc4a39..b16297b1722a6 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
+<% add_decidim_page_title(t(".title", budget: decidim_sanitize_translated(budget.title))) %>
+
- <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+ <%= t(".title", budget: decidim_sanitize_translated(budget.title)) %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index ad4cef7763585..7c2f6e7f77309 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -3,7 +3,7 @@
+ <% if has_replies_in_children? %>
+ <%= render :replies %>
+ <% elsif can_reply? %>
+
+ <% end %>
<% end %>
<% if current_user.present? %>
<%= cell("decidim/report_button", model, modal_id: "flagModalComment#{model.id}").flag_modal %>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 4e0c60d16d97c..3c792e8a940b6 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -86,10 +86,6 @@ def comment_body
formatted_body
end
- def replies
- SortedComments.for(model, order_by: order)
- end
-
def order
options[:order] || "older"
end
@@ -234,7 +230,11 @@ def has_replies?
end
def has_replies_in_children?
- model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
+ replies_count.positive?
+ end
+
+ def replies_count
+ @replies_count ||= model.replies.count
end
# action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
index 9670e0ca5ee7c..78bbcedd57d47 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
@@ -31,7 +31,7 @@
<% end %>
">
- <%= t("attachment_collections.new.title", scope: "decidim.admin") %> + <%= t(".title") %>
- <%= t(".attachments_title") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment %>
<%= link_to t("actions.attachment.new", scope: "decidim.admin"), url_for(action: :new), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
index e1ec2474f0e12..934d7c2f40109 100644
--- a/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/authorization_workflows/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("authorization_workflows", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("authorization_workflows", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
index 086ab32ea54a7..e83213f7b8852 100644
--- a/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/block_user/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(".title", name: user.name)) %>
+
<%= t(".title", name: user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/index.html.erb b/decidim-admin/app/views/decidim/admin/components/index.html.erb
index 8786950970980..4b41cdf758314 100644
--- a/decidim-admin/app/views/decidim/admin/components/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to?(:create, :component) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
index 9f57bccc47c3e..0b46cc872ac06 100644
--- a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
index c66b11589e51f..a1c415ffdacb2 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
- Transfer User
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
index 16117766de80e..392d6b569586b 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("title", scope: "decidim.admin.conflicts") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
index 858a3445a11e8..b3a7ec5cc863f 100644
--- a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+ <%= t(".title") %> <%= current_organization_name %>
@@ -46,6 +46,6 @@
<% end %>
<% if current_user.admin_terms_accepted? %>
- <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+ <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
deleted file mode 100644
index 77839a7a15cdf..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We are contacting you to notify you that your password has been changed.
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
deleted file mode 100644
index 708edf07be4be..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to "Change my password", edit_password_url(@resource, reset_password_token: @token) %>
-
-If you did not request this, please ignore this email.
-Your password will not change until you access the link above and create a new one.
diff --git a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
index 6e05cc045575a..31d11247ac7d7 100644
--- a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
+++ b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render partial: "form", object: @form %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
index 2fab7a6d3c532..65649997871f4 100644
--- a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if current_organization.available_authorizations.empty? %>
<%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
- <%= t "decidim.admin.titles.impersonatable_users" %>
+ <%= t ".title" %>
<% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
<%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
index cce55b1bec168..ebd237dbf6062 100644
--- a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if creating_managed_user? %>
- <%= t(".impersonate_new_managed_user") %>
+ <%= t(".title") %>
<% else %>
<% if @form.user.managed? %>
<%= t(".impersonate_existing_managed_user", name: @form.user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
index bdf151be9c30f..14a53b52b2894 100644
--- a/decidim-admin/app/views/decidim/admin/imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
<%= import_manifest.message(:title, self) %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
index cbac48cb47b9e..d85d0543b147f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.admin_log" %>
+ <%= t "decidim.admin.logs.index.title" %>
<%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/index.html.erb b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
index b08e5fe4f8509..7af432ec8134f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
<%= decidim_paginate logs %>
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 c1dfb56faae16..28a5487da2c1f 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
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.impersonations" %>
+ <%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
index c890a31d0ec2a..8df79d3c485e8 100644
--- a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".new_managed_user_promotion") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
index 66599d17432ae..23891cac94b7e 100644
--- a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
- <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+ <%= t ".title", template_name: t(template_manifest.public_name_key) %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
index 362cdd1ffd248..ff6c3600f26aa 100644
--- a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t ".preview" %>
+ <%= t ".title" %>
<% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
index a190d5bed569a..c1f179dbe0460 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
-
+
- <%= t "decidim.admin.titles.participants" %>
+
+ <%= t ".title" %>
+
<%= admin_filter_selector %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..3c306de596edb 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= link_to user.email, "mailto:#{user.email}" %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
index 2ea4feeda353e..dc82f699dd6a0 100644
--- a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("title", scope: "decidim.admin.organization_external_domain_allowlist.form") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
index c6cee2d5210a3..63ab9ef2ce1ee 100644
--- a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -1,4 +1,11 @@
-
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+
+ <%= t ".title" %>
+
+
<%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
diff --git a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
index 4a789ab31623c..d34ec4631dddb 100644
--- a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.scope_types" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :scope_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
diff --git a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
index 7730666b48870..6e3f35dd52160 100644
--- a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
@@ -1,11 +1,11 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
+<% add_decidim_page_title(t(".title")) %>
<% if parent_scope %>
<%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
<% else %>
- <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
+ <%= t ".title" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
index e0b5e3b720961..4e498e12c866f 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", name: resource_title)) %>
+
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
index f099e67eb7fee..238768df7415a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
@@ -1,5 +1,3 @@
-<% add_decidim_page_title(content_blocks_title) %>
-
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
index 36d0aabb9a743..e19a0d32d8ab2 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(content_blocks_title) %>
+
<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
index 3f330918d7615..8ce44f19debee 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(content_block.public_name_key)) %>
+
<%= t content_block.public_name_key %>
diff --git a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
index 023a2d6b92fbc..bcc6f0405309c 100644
--- a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("page_topics", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
index c44814f1a7da1..6c7faa224edd4 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
+
<%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
index 7cc99a8881e32..6fe5a6a8eeb07 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("pages", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :static_page %>
<%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
index 85b867615d752..9dbec1682d5d9 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.statistics" %>
+ <%= t "decidim.admin.statistics.index.title" %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
index 209083c2d9cb2..c846c90b461a3 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render(
partial: "decidim/admin/statistics/statistics",
locals: {
diff --git a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
index f206951a7af75..9cb6426932777 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("taxonomies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.taxonomies" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_taxonomy"), new_taxonomy_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
index d4e0d04a5848d..fa0dd723d2d63 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name))) %>
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(root_taxonomy.name))) %>
- <%= t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name)) %>
+ <%= t(".title", taxonomy: translated_attribute(root_taxonomy.name)) %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_filter"), new_taxonomy_filter_path(root_taxonomy), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
index ec88de7a2a715..8d2fc0f61787d 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render "decidim/admin/taxonomy_filters_selector/taxonomies_select" %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
index 07c677b1a2def..a146049a944e5 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= button_tag class: "button button__secondary button__sm", id: "save-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
index b70d48b8c69f0..389dfd7ce688e 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= link_to decidim_admin.taxonomy_filters_selector_path(taxonomy_filter_id: taxonomy_filter.id, taxonomy_id: root_taxonomy.id, component_id: component.id), remote: true, method: :delete, class: "button button__transparent-secondary button__sm", id: "remove-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
index 56332917d60e4..e77108030c23c 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_item_path(taxonomy_id: taxonomy.id, id: taxonomy_item.id ), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
index b2a4c43a91f36..594d58931c768 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_items_path(taxonomy), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/users/index.html.erb b/decidim-admin/app/views/decidim/admin/users/index.html.erb
index 3d26b0a64acb8..3306f63c147c9 100644
--- a/decidim-admin/app/views/decidim/admin/users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.users" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :admin_user %>
<%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 0d554d179ab7e..2375605ebb12d 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -208,6 +208,9 @@ en:
user:
new: New admin
view_deleted_components: View deleted components
+ admin_terms:
+ show:
+ title: Admin terms of service
admin_terms_of_service:
accept:
error: There was a problem while accepting the admin terms of service.
@@ -221,7 +224,6 @@ en:
alert: 'Required: Review our admin terms of service'
callout: Please take a moment to review the admin terms of service. Otherwise you will not be able to manage the platform.
cta: Review them now.
- title: Admin terms of service
area_types:
create:
error: There was a problem creating a new area type.
@@ -231,6 +233,8 @@ en:
edit:
title: Edit area type
update: Update
+ index:
+ title: Area types
new:
create: Create area type
title: New area type
@@ -248,6 +252,8 @@ en:
edit:
title: Edit area
update: Update
+ index:
+ title: Areas
new:
create: Create area
title: New area
@@ -265,7 +271,7 @@ en:
title: Edit folder
update: Update
index:
- attachment_collections_title: Attachment folders
+ title: Attachment folders
new:
create: Create
title: New folder
@@ -282,7 +288,7 @@ en:
title: Edit attachment
update: Update
index:
- attachments_title: Attachments
+ title: Attachments
new:
create: Create attachment
title: New attachment
@@ -291,6 +297,9 @@ en:
success: Attachment updated successfully.
attachments_privacy_warning:
message: Be careful when working with attachments in a private space. Any participant could share this document to others.
+ authorization_workflows:
+ index:
+ title: Verification methods
autocomplete:
no_results: No results found
search_prompt: Type at least three characters to search.
@@ -335,6 +344,7 @@ en:
name: Component name
type: Component type
visibility: Visibility
+ title: Components
manage_trash:
title: Deleted components
new:
@@ -342,7 +352,6 @@ en:
title: 'Add component: %{name}'
publish:
success: The component has been successfully published.
- title: Components
unpublish:
success: The component has been successfully unpublished.
update:
@@ -354,12 +363,14 @@ en:
unpublished: Unpublished
conflicts:
attempts: Attempts
+ edit:
+ title: Transfer User
'false': 'No'
index:
text: Search by current user email, name or nickname
+ title: Verification conflicts
managed_user_name: Managed User
solved: Solved
- title: Verification conflicts
transfer:
email: Email
error: There was a problem transferring the current participant to managed participant.
@@ -392,6 +403,7 @@ en:
title: Pending Moderations
show:
dropdown: Dropdown
+ title: Dashboard
view_more_logs: View more logs
domain_allowlist:
form:
@@ -488,6 +500,8 @@ en:
form:
save: Save
success: Help sections updated successfully.
+ update:
+ title: Help sections
impersonatable_users:
index:
filter:
@@ -503,6 +517,7 @@ en:
promote: Promote
search: Search
status: Status
+ title: Manageable participants
view_logs: View logs
impersonations:
close_session:
@@ -519,7 +534,7 @@ en:
impersonate: Impersonate
impersonate_existing_managed_user: Manage participant "%{name}"
impersonate_existing_user: Manage participant "%{name}"
- impersonate_new_managed_user: Manage new participant
+ title: Impersonate participant
imports:
and: and
data_errors:
@@ -563,20 +578,25 @@ en:
participatory_space: Find participatory space
text: Search by user email, name or nickname
user: User
+ index:
+ title: Admin log
logs_list:
no_logs_yet: There are no logs yet.
no_matching_logs: There are no logs with the provided search filters. Try to change them and retry.
manage_trash:
deleted_items_warning: You are currently viewing deleted items. To make any edits or changes, you must first restore them.
managed_users:
+ impersonation_logs:
+ index:
+ title: Impersonations
promotion:
error: There was a problem promoting the managed participant.
success: The managed participant has been successfully promoted.
promotions:
new:
explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
- new_managed_user_promotion: New managed participant promotion
promote: Promote
+ title: New managed participant promotion
members:
create:
error: There was a problem adding a member for this participatory space.
@@ -805,7 +825,7 @@ en:
title: Newsletter templates
use_template: Use this template
show:
- preview: 'Preview template: %{template_name}'
+ title: 'Preview template: %{template_name}'
use_template: Use this template
newsletters:
confirm_recipients:
@@ -870,10 +890,10 @@ en:
send_to_user:
sent_successfully: Newsletter has been sent successfully to %{email}
show:
- preview: Preview
select_recipients_to_deliver: Select recipients to deliver
send_me_a_test_email: Send me a test email
subject: Subject
+ title: Preview
update:
error: There was a problem updating this newsletter.
success: Newsletter updated successfully. Please review it before sending.
@@ -907,12 +927,15 @@ en:
send_message: Send message
show_email: Show email
status: Status
+ title: Participants
unblock: Unblock
unofficialize: Unofficialize
new:
badge: Officialization badge
officialize: Officialize
title: Officialize participant "%{name}"
+ show_email:
+ title: Show email
show_email_modal:
description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
email_address: Email address
@@ -957,6 +980,7 @@ en:
success: Organization updated successfully.
organization_external_domain_allowlist:
edit:
+ title: Allowed list of external domains
update: Update
external_domain:
down: Down
@@ -965,7 +989,6 @@ en:
up: Up
form:
add: Add to allowed list
- title: Allowed list of external domains
reminders:
create:
error: There was a problem creating reminders.
@@ -974,6 +997,7 @@ en:
other: "%{count} users will be reminded."
new:
submit: Send
+ title: Send reminders
resource_permissions:
edit:
submit: Submit
@@ -991,6 +1015,8 @@ en:
edit:
title: Edit scope type
update: Update
+ index:
+ title: Scope types
new:
create: Create scope type
title: New scope type
@@ -1007,6 +1033,8 @@ en:
edit:
title: Edit scope
update: Update
+ index:
+ title: Scopes
new:
create: Create scope
title: New scope
@@ -1079,6 +1107,8 @@ en:
edit:
title: Edit topic
update: Update topic
+ index:
+ title: Topics
new:
create: New topic
title: New topic
@@ -1103,6 +1133,7 @@ en:
slug_help_html: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. Example: %{url}'
index:
last_notable_change: Last notable change
+ title: Pages
new:
create: New page
title: New page
@@ -1112,6 +1143,9 @@ en:
update:
error: There was a problem updating this page.
success: Page updated successfully.
+ statistics:
+ index:
+ title: Statistics
taxonomies:
actions:
actions: Actions
@@ -1142,6 +1176,7 @@ en:
description: Taxonomies and filters allow administrators to sort and organize content. For example, add a taxonomy with the city's districts and neighborhoods and then create filters only with the districts or for a specific neighborhood.
new_taxonomy: New taxonomy
no_items_found: No taxonomies found matching the search criteria.
+ title: Taxonomies
name: Name
new:
create: Create taxonomy
@@ -1186,6 +1221,7 @@ en:
description: A taxonomy filter allows admins to sort and filter participatory spaces based on a taxonomy. For example, add a taxonomy filter to sort processes by geographical scope.
empty: There are currently no taxonomy filters. Create a list of taxonomy filters here to sort and filter participatory spaces based on a taxonomy.
new_filter: New filter
+ title: Taxonomy filters for "%{taxonomy}"
new:
back: Back
create: Create taxonomy filter
@@ -1202,13 +1238,17 @@ en:
error: There was a problem updating this taxonomy filter.
success: Taxonomy filter updated successfully.
taxonomy_filters_selector:
+ index:
+ title: Taxonomy filters
new:
add_new_items_html: If you need to set a new filter or item, do it through the configuration settings or by clicking here.
items_count: "%{count} items"
save: Save
+ title: New taxonomy filter selector
show:
items_count: "%{count} items"
remove: Remove
+ title: Taxonomy filter selector
taxonomies_select:
filters: Filters
select_filter: Select a filter
@@ -1223,25 +1263,12 @@ en:
none: None
title: New item in %{taxonomy}
titles:
- admin_log: Admin log
- area_types: Area types
areas: Areas
authorization_workflows: Verification methods
- dashboard: Dashboard
- edit_external_domains: Allowed list of external domains
- impersonatable_users: Manageable participants
- impersonations: Participants management
menu: Menu
- page_topics: Topics
- pages: Pages
panel: Admin
- participants: Participants
- scope_types: Scope types
scopes: Scopes
statistics: Statistics
- taxonomies: Taxonomies
- taxonomy_filters: Taxonomy filters for "%{taxonomy}"
- users: Administrators
tooltips:
cannot_destroy_taxonomy_filter: Cannot destroy this taxonomy filter
cannot_edit_taxonomy_filter: Cannot edit this taxonomy filter
@@ -1265,6 +1292,8 @@ en:
email: Email
name: Name
role: Role
+ index:
+ title: Administrators
new:
create: Invite
title: Invite new administrator
@@ -1276,6 +1305,10 @@ en:
last_week: Last week
no_users_count_statistics_yet: There are no participant count statistics yet.
participants: Participants
+ components:
+ settings:
+ global:
+ taxonomy_filters_unavailable: Selecting taxonomy filters will be possible after the component is created.
forms:
errors:
impersonate_user:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index 2c6b77e359875..57a26599c651e 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "active_link_to", "~> 1.0"
s.add_dependency "decidim-core", version
- s.add_dependency "devise", "~> 4.7"
+ s.add_dependency "devise", ">= 4.7", "< 6.0"
s.add_dependency "devise-i18n", "~> 1.2"
s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
diff --git a/decidim-admin/lib/decidim/admin.rb b/decidim-admin/lib/decidim/admin.rb
index a7778ccba621b..652672dbd120a 100644
--- a/decidim-admin/lib/decidim/admin.rb
+++ b/decidim-admin/lib/decidim/admin.rb
@@ -15,8 +15,6 @@ module Admin
autoload :Import, "decidim/admin/import"
autoload :CustomImport, "decidim/admin/custom_import"
- include ActiveSupport::Configurable
-
# Public: Stores an instance of ViewHooks
def self.view_hooks
@view_hooks ||= ViewHooks.new
diff --git a/decidim-admin/lib/decidim/admin/menu.rb b/decidim-admin/lib/decidim/admin/menu.rb
index 0f92edad7f53c..011d5c7f77ccc 100644
--- a/decidim-admin/lib/decidim/admin/menu.rb
+++ b/decidim-admin/lib/decidim/admin/menu.rb
@@ -48,7 +48,7 @@ def self.register_workflows_menu!
def self.register_impersonate_menu!
Decidim.menu :impersonate_menu do |menu|
menu.add_item :conflicts,
- I18n.t("title", scope: "decidim.admin.conflicts"),
+ I18n.t("title", scope: "decidim.admin.conflicts.index"),
decidim_admin.conflicts_path,
active: is_active_link?(decidim_admin.conflicts_path),
if: allowed_to?(:index, :impersonatable_user)
diff --git a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
index 67e0ec58d1624..adbb0a5cc694b 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
@@ -53,6 +53,7 @@
fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
click_on I18n.t("decidim.admin.block_user.new.action")
+ expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
expect(content.reload).to be_hidden
diff --git a/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
new file mode 100644
index 0000000000000..dc937e285ad5c
--- /dev/null
+++ b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::HomepageContentBlockCell, type: :cell do
+ controller Decidim::Admin::OrganizationHomepageController
+
+ subject { cell("decidim/admin/homepage_content_block", content_block).call }
+
+ let(:organization) { create(:organization) }
+ let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "renders the content block name" do
+ expect(subject).to have_content("Hero image")
+ end
+
+ it "renders a link to edit the content block" do
+ expect(subject).to have_link(href: /edit/)
+ end
+
+ it "renders a link to destroy the content block" do
+ expect(subject).to have_css('a[data-method="delete"][href*="/content_blocks/"]')
+ end
+
+ it "renders the drag handle" do
+ expect(subject).to have_css("[draggable=\"true\"]")
+ end
+
+ context "when content block is not persisted" do
+ let(:content_block) { build(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "does not render edit or destroy links" do
+ expect(subject).to have_no_link(href: %r{/content_blocks/\d+/edit$})
+ expect(subject).to have_no_css('a[data-method="delete"]')
+ end
+ end
+
+ context "when content block has no settings" do
+ let(:content_block) do
+ create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage)
+ end
+
+ it "does not render edit link" do
+ expect(subject).to have_no_link(href: /edit/)
+ end
+ end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index 1ca15f31bb0c5..903dc8d24465c 100644
--- a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -45,6 +45,19 @@ module Decidim::Admin::ParticipatorySpace
expect(members.count).to eq 1
end
+ it "creates the member only one time" do
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 0
+
+ subject.call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+
+ form = double(invalid?: false, email:, current_user:, name:, role:, published: false)
+ described_class.new(form, participatory_space, via_csv:).call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+ end
+
it "creates a new user with no application admin privileges" do
subject.call
expect(Decidim::User.last).not_to be_admin
diff --git a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
index 8b263c5f5a110..0d0425c9c6fff 100644
--- a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
+++ b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
@@ -33,7 +33,7 @@ module Admin
it "breadcrumbs are set" do
get :index
- expect(controller.helpers.breadcrumb_items).to eq([label: "Taxonomies", url: taxonomies_path])
+ expect(controller.helpers.breadcrumb_items).to eq([{ label: "Taxonomies", url: taxonomies_path }])
end
end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index 2010bb0ba5548..0b64b1d7fa75a 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -55,10 +55,23 @@ def render_input
expect(form).to receive(:select).with(
:test,
full_choices,
- options
+ options, { disabled: false }
)
render_input
end
+
+ context "when the field should be disabled" do
+ let(:options) { { include_blank: false, readonly: true, label: "A test" } }
+
+ it "is supported" do
+ expect(form).to receive(:select).with(
+ :test,
+ full_choices,
+ options.except(:readonly), { disabled: true }
+ )
+ render_input
+ end
+ end
end
describe "booleans" do
@@ -188,6 +201,18 @@ def render_input
expect(view).to receive(:render).with(partial: "decidim/admin/components/taxonomy_filters_drawer")
render_input
end
+
+ context "when component is not persisted" do
+ let(:second_component) { build(:dummy_component, participatory_space: current_participatory_space) }
+
+ before do
+ view.instance_variable_set(:@component, second_component)
+ end
+
+ it "renders a message indicating that the component is missing" do
+ expect(render_input).to include("Selecting taxonomy filters will be possible after the component is created.")
+ end
+ end
end
describe "help texts" do
diff --git a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
index a72d503bfa2e1..8d22a78dd64b5 100644
--- a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
+++ b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
@@ -19,7 +19,7 @@
end
it "show Admin log panel" do
- expect(page).to have_content(t("decidim.admin.titles.admin_log"))
+ expect(page).to have_content(t("decidim.admin.logs.index.title"))
end
context "when does not have Pending moderations" do
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index ef869626cbdb4..ff67be3186ad4 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -52,5 +52,130 @@
expect(page).to have_current_path "/admin/admin_terms/show"
end
+
+ it "displays admin password requirements" do
+ visit last_email_link
+
+ expect(page).to have_content("15 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email, the organization's host")
+ expect(page).to have_content("must be different from your old passwords")
+ end
+
+ it "rejects passwords that are too short for admin" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "short123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("password is too short")
+ end
+
+ it "rejects passwords containing the user's name" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "Fiorello123456789!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("is too similar to your name")
+ end
+
+ it "rejects passwords with less than 5 unique characters" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "aaaaaaaaaaaaaaa!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("does not have enough unique characters")
+ end
+ end
+
+ context "when inviting a regular user" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+
+ let!(:invited_user) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited User",
+ email: "invited_user@example.org"
+ },
+ inviter
+ )
+ end
+ end
+
+ it "displays regular user password requirements in help text" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+
+ it "allows accepting invitation with valid user password" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "invited_user"
+ fill_in :invitation_user_password, with: "decidim123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("Your password was set successfully. You are now signed in.")
+ expect(Decidim::User.find_by(email: "invited_user@example.org")).not_to be_admin
+ end
+ end
+
+ context "when admin_password_strong is disabled" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+ let!(:invited_admin) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited Admin",
+ email: "invited_admin@example.org",
+ admin: true
+ },
+ inviter
+ )
+ end
+ end
+
+ before do
+ allow(Decidim.config).to receive(:admin_password_strong).and_return(false)
+ end
+
+ it "displays regular password requirements for admins" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+ end
+
+ context "with invalid invitation token" do
+ it "shows error for invalid token" do
+ visit "/users/invitation/accept?invitation_token=invalid_token"
+
+ expect(page).to have_content("The invitation token provided is not valid")
+ end
end
end
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index efabd2af563e4..28167accf7538 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -61,6 +61,25 @@
expect(page).to have_content("There is an error in this field.")
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization.name["ca"])
+
+ within "#organization-name-tabs" do
+ click_on "English"
+ end
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
context "when there are more than 4 locales in the organization" do
let(:available_locales) { %w(en ca es fr it) }
let(:organization_names) do
@@ -93,6 +112,23 @@
load "#{Decidim::Admin::Engine.root}/app/forms/decidim/admin/organization_form.rb"
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization_names[:ca])
+
+ select "English", from: "organization-name-tabs"
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
it "renders a dropdown for the language selector and switches between languages" do
visit decidim_admin.edit_organization_path
diff --git a/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
new file mode 100644
index 0000000000000..1fd1b638639d4
--- /dev/null
+++ b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin publishes/unpublishes content blocks" do
+ let(:organization) { create(:organization) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ end
+
+ context "when publishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+ it "shows published content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-available" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).not_to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_css("[id^=hero]")
+ end
+ end
+
+ context "when unpublishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+ let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+ it "does not show unpublished content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-actives" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_no_css("[id^=hero]")
+ end
+ end
+end
diff --git a/decidim-admin/spec/system/member_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
index 8be1fb11dfe3f..8e38f2f22e3ed 100644
--- a/decidim-admin/spec/system/member_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -30,7 +30,7 @@
context "when there are existing users" do
before do
- create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
+ create_list(:assembly_member, 3, participatory_space: assembly, organization: assembly.organization)
visit current_path
end
diff --git a/decidim-admin/spec/system/member_spec.rb b/decidim-admin/spec/system/member_spec.rb
index 2afe0b3eec5e7..06f6053943b7c 100644
--- a/decidim-admin/spec/system/member_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -8,7 +8,7 @@
let!(:user) { create(:user, :admin, :confirmed, organization:) }
let(:assembly) { create(:assembly, organization:, has_members: true) }
- let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
+ let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, organization: assembly.organization) }
before do
switch_to_host(organization.host)
diff --git a/decidim-ai/lib/decidim/ai.rb b/decidim-ai/lib/decidim/ai.rb
index 87aaf1f9d8653..18ef28036508a 100644
--- a/decidim-ai/lib/decidim/ai.rb
+++ b/decidim-ai/lib/decidim/ai.rb
@@ -7,7 +7,5 @@ module Ai
autoload :StrategyRegistry, "decidim/ai/strategy_registry"
autoload :SpamDetection, "decidim/ai/spam_detection/spam_detection"
autoload :Language, "decidim/ai/language/language"
-
- include ActiveSupport::Configurable
end
end
diff --git a/decidim-ai/lib/decidim/ai/engine.rb b/decidim-ai/lib/decidim/ai/engine.rb
index 81c0cff9a4eb7..02dcec0a4ccd0 100644
--- a/decidim-ai/lib/decidim/ai/engine.rb
+++ b/decidim-ai/lib/decidim/ai/engine.rb
@@ -117,18 +117,6 @@ class Engine < ::Rails::Engine
.perform_later(data[:resource],
data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
end
- ActiveSupport::Notifications.subscribe("decidim.proposals.create_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
- ActiveSupport::Notifications.subscribe("decidim.proposals.update_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
end
end
diff --git a/decidim-ai/lib/decidim/ai/language/language.rb b/decidim-ai/lib/decidim/ai/language/language.rb
index 6e74db26f4348..d72d165ab4236 100644
--- a/decidim-ai/lib/decidim/ai/language/language.rb
+++ b/decidim-ai/lib/decidim/ai/language/language.rb
@@ -4,7 +4,14 @@ module Decidim
module Ai
module Language
autoload :Formatter, "decidim/ai/language/formatter"
- include ActiveSupport::Configurable
+
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
# Text cleanup service
#
@@ -15,9 +22,7 @@ module Language
# # your code
# end
# end
- config_accessor :formatter do
- Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
- end
+ mattr_accessor :formatter, default: Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
end
end
end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb b/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
deleted file mode 100644
index 7a9f044de545f..0000000000000
--- a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Ai
- module SpamDetection
- module Resource
- class CollaborativeDraft < Base
- def fields = [:body, :title]
-
- protected
-
- def query = Decidim::Proposals::CollaborativeDraft.includes(:moderation)
- end
- end
- end
- end
-end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
index 61bcb72c7a0ec..80d691ce1076d 100644
--- a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
+++ b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
@@ -3,8 +3,6 @@
module Decidim
module Ai
module SpamDetection
- include ActiveSupport::Configurable
-
autoload :Service, "decidim/ai/spam_detection/service"
module Resource
@@ -13,7 +11,6 @@ module Resource
autoload :Debate, "decidim/ai/spam_detection/resource/debate"
autoload :Initiative, "decidim/ai/spam_detection/resource/initiative"
autoload :Proposal, "decidim/ai/spam_detection/resource/proposal"
- autoload :CollaborativeDraft, "decidim/ai/spam_detection/resource/collaborative_draft"
autoload :Meeting, "decidim/ai/spam_detection/resource/meeting"
autoload :UserBaseEntity, "decidim/ai/spam_detection/resource/user_base_entity"
end
@@ -28,31 +25,31 @@ module Strategy
autoload :Bayes, "decidim/ai/spam_detection/strategy/bayes"
end
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
+
# When the engine is consistently marking spam content without errors,
# you can skip human intervention by enabling this functionality
- config_accessor :hide_reported_resources_automatically do
- Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
- end
+ mattr_accessor :hide_reported_resources_automatically, default: Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
# This is the email address used by the spam engine to
# properly identify the user that will report users and content
- config_accessor :reporting_user_email do
- Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
- end
+ mattr_accessor :reporting_user_email, default: Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :resource_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :resource_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
# You can configure the spam delay for the spam detection service.
# The default value is 30 seconds
- config_accessor :spam_detection_delay do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
- end
+ mattr_accessor :spam_detection_delay, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -71,49 +68,41 @@ module Strategy
# }
# }
# }
- config_accessor :resource_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
- }
+ mattr_accessor :resource_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method. or even define own resource visibility criteria.
# This is the place where new resources can be registered following the pattern
# Resource => Handler
- config_accessor :resource_models do
- @models ||= begin
- models = {}
- models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
- models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
- models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
- models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
- models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
- models["Decidim::Proposals::CollaborativeDraft"] = "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" if Decidim.module_installed?("proposals")
- models
- end
+ mattr_accessor :resource_models
+ self.resource_models ||= begin
+ models = {}
+ models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
+ models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
+ models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
+ models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
+ models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
+ models
end
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :resource_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :resource_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :user_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :user_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -132,32 +121,24 @@ module Strategy
# }
# }
# }
- config_accessor :user_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
- }
+ mattr_accessor :user_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method or what a hidden user really is.
- config_accessor :user_models do
- {
- "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity"
- }
- end
+ mattr_accessor :user_models, default: { "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity" }
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :user_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :user_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# this is the generic resource classifier class. If you need to change your own class, please change the
# configuration of `Decidim::Ai::SpamDetection.detection_service` variable.
diff --git a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
deleted file mode 100644
index 247dd8953c591..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User creates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) { Decidim::Proposals::CreateCollaborativeDraft.new(form, author) }
-
- include_examples "Collaborative draft spam analysis"
-end
diff --git a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
deleted file mode 100644
index 563b125e174ee..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User updates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) do
- Decidim::Proposals::UpdateCollaborativeDraft.new(form, author, collaborative_draft)
- end
-
- include_examples "Collaborative draft spam analysis" do
- let!(:collaborative_draft) do
- create(:collaborative_draft,
- component:,
- users: [author],
- title: "Some draft that is not blocked",
- body: "The body for the proposal.")
- end
- end
-end
diff --git a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
index 0cb1ddaf4fd1a..9b2eab63a0d89 100644
--- a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
+++ b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
@@ -103,18 +103,6 @@
include_examples "some resources are being spam"
end
- context "when trained model is Decidim::Proposals::CollaborativeDraft" do
- let(:manifest_name) { "proposals" }
- let(:training) { 8 }
-
- let!(:reportable) { create(:collaborative_draft, component:, users: [author], title: "Hidden resource") }
- let!(:resources) { create_list(:collaborative_draft, 3, component:, users: [author]) }
- let(:resource_models) { { "Decidim::Proposals::CollaborativeDraft" => "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" } }
-
- include_examples "resource is being indexed"
- include_examples "some resources are being spam"
- end
-
context "when trained model is Decidim::Debates::Debate" do
let(:manifest_name) { "debates" }
let(:training) { 8 }
diff --git a/decidim-ai/spec/shared/events_examples.rb b/decidim-ai/spec/shared/events_examples.rb
index 6cdfc2df6d30b..c90dd5d4fc5da 100644
--- a/decidim-ai/spec/shared/events_examples.rb
+++ b/decidim-ai/spec/shared/events_examples.rb
@@ -172,7 +172,7 @@
context "when regular content is added" do
let(:description) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -200,7 +200,7 @@
context "when regular content is added" do
let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -210,31 +210,3 @@
end
end
end
-
-shared_examples "Collaborative draft spam analysis" do
- context "when spam content is added" do
- let(:body) { "Claim your prize today so you can win." }
- let(:title) { "You are the Lucky winner" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 1 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-
- context "when regular content is added" do
- let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 0 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-end
diff --git a/decidim-api/app/controllers/decidim/api/sessions_controller.rb b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
index 97011840cf0bd..6299128062f1c 100644
--- a/decidim-api/app/controllers/decidim/api/sessions_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
@@ -45,7 +45,7 @@ def respond_with(resource, _opts = {})
render json: serialized_user.merge("avatar" => nil)
end
- def respond_to_on_destroy
+ def respond_to_on_destroy(*)
head :ok
end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 479b5af792aa2..3adeff8e3035b 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
end
s.add_dependency "decidim-core", version
- s.add_dependency "devise-jwt", "~> 0.12.1"
+ s.add_dependency "devise-jwt", ">= 0.12.1", "< 0.14.0"
s.add_dependency "graphql", ">= 2.4.17", "< 2.6"
- s.add_dependency "graphql-docs", "~> 5.0"
- s.add_dependency "rack-cors", "~> 1.0"
+ s.add_dependency "graphql-docs", ">= 5", "< 7"
+ s.add_dependency "rack-cors", ">= 1", "< 4"
s.add_development_dependency "decidim-assemblies", version
s.add_development_dependency "decidim-comments", version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 11f9beec80ec2..632f18eb5e53e 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -11,54 +11,44 @@ module Decidim
# This module holds all business logic related to exposing a Public API for
# decidim.
module Api
- include ActiveSupport::Configurable
+ class << self
+ def config = self
- # defines the schema max_per_page to configure GraphQL pagination
- config_accessor :schema_max_per_page do
- Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+ def configure
+ yield self
+ end
end
+ # defines the schema max_per_page to configure GraphQL pagination
+ mattr_accessor :schema_max_per_page, default: Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+
# defines the schema max_complexity to configure GraphQL query complexity
- config_accessor :schema_max_complexity do
- Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
- end
+ mattr_accessor :schema_max_complexity, default: Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
# defines how many aliases are permitted in a query
- config_accessor :max_aliases do
- Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
- end
+ mattr_accessor :max_aliases, default: Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
# defines the schema max_depth to configure GraphQL query max_depth
- config_accessor :schema_max_depth do
- Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- end
+ mattr_accessor :schema_max_depth, default: Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- config_accessor :disclose_system_version do
- Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
- end
+ mattr_accessor :disclose_system_version, default: Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
# makes the API authentication necessary in order to access it
# access it.
- config_accessor :force_api_authentication do
- Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
- end
+ mattr_accessor :force_api_authentication, default: Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
# allows anonymous introspection queries
# If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
# Otherwise, anyone can access it, causing security issues.
- config_accessor :enable_anonymous_introspection do
- Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
- end
+ mattr_accessor :enable_anonymous_introspection, default: Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
# The expiration time of the JWT tokens, after which issued token will
# expire. Recommended to match the value of
# `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
- config_accessor :jwt_expires_in do
- Decidim::Env.new(
- "DECIDIM_API_JWT_EXPIRES_IN",
- Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
- ).to_i
- end
+ mattr_accessor :jwt_expires_in, default: Decidim::Env.new(
+ "DECIDIM_API_JWT_EXPIRES_IN",
+ Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
+ ).to_i
# This declares all the types an interface or union can resolve to. This needs
# to be done in order to be able to have them found. This is a shortcoming of
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index 8a45ea3178273..af78fe6474a65 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when creating a new assembly
# in the system.
class CreateAssembly < Decidim::Commands::CreateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
:promoted, :taxonomizations, :parent, :organization,
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 3042adeeded07..901f911460d51 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -63,7 +63,7 @@ def duplicate_assembly
end
def duplicate_assembly_attachments
- [:hero_image, :banner_image].each do |attribute|
+ [:hero_image].each do |attribute|
next unless @assembly.attached_uploader(attribute).attached?
@duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index e91d4df267451..5747fa541ca5e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when updating a new assembly
# in the system.
class UpdateAssembly < Decidim::Commands::UpdateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
:taxonomizations, :parent, :private_space, :developer_group, :local_area,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
index 0c0d4f6753e0d..9bafd2fcb00b2 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -37,7 +37,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
@@ -63,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
- render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+ render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
index e5e6fcf6d2299..012fa88b7f97a 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
@@ -25,7 +25,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index f453269c3876e..d6b4bcc7cc644 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
index 31b07defed14e..afb1fd8012218 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
@@ -19,6 +19,7 @@ module AssemblyAdmin
included do
include Decidim::Admin::ParticipatorySpaceAdminContext
+
helper_method :current_assembly
add_breadcrumb_item_from_menu :admin_assembly_menu
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 5ab89729e7c4a..cbbfd81cf55d5 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -54,9 +54,7 @@ class AssemblyForm < Form
attribute :duration, Decidim::Attributes::LocalizedDate
attribute :included_at, Decidim::Attributes::LocalizedDate
- attribute :banner_image
attribute :hero_image
- attribute :remove_banner_image, Boolean, default: false
attribute :remove_hero_image, Boolean, default: false
validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,7 +67,6 @@ class AssemblyForm < Form
validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
validates :title, :subtitle, :description, :short_description, translatable_presence: true
- validates :banner_image, passthru: { to: Decidim::Assembly }
validates :hero_image, passthru: { to: Decidim::Assembly }
validates :weight, presence: true
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 208cc845bae6b..eaacc4dec64a8 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -71,9 +71,6 @@ class Assembly < ApplicationRecord
has_one_attached :hero_image
validates_upload :hero_image, uploader: Decidim::HeroImageUploader
- has_one_attached :banner_image
- validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
validates :slug, uniqueness: { scope: :organization }
validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 0629e11cc3264..dded25d18a7ea 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
-
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
-
-
-
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
index 8ef195373f662..2dd8a49aa4c97 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
@@ -50,10 +50,6 @@ export default class extends Controller {
if (isTransparentCheckbox) {
isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-
- if (isTransparentCheckbox.checked) {
- isTransparentCheckbox.checked = false;
- }
}
if (specialFeatures) {
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
index 024b0b10455f1..ed8f5f43512c5 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
@@ -9,10 +9,6 @@ def hero_image_url
assembly.attached_uploader(:hero_image).url
end
- def banner_image_url
- assembly.attached_uploader(:banner_image).url
- end
-
def area_name
return if assembly.area.blank?
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 35be379dc5886..8779856149558 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -42,7 +42,7 @@ def query
def assemblies_user_admins
Decidim::User.where(
id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
- .select(:decidim_user_id)
+ .select(:decidim_user_id)
)
end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index b0b825f029a1f..28900d7a89b9c 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -60,8 +60,6 @@ def import(attributes, _user, opts)
meta_scope: attributes["meta_scope"]
)
import_hero_image(attributes["remote_hero_image_url"])
- import_banner_image(attributes["remote_banner_image_url"])
-
@imported_assembly.save!
@imported_assembly
end
@@ -84,27 +82,24 @@ def import_folders_and_attachments(attachments)
next
end
- begin
- file_tmp = URI.parse(url).open
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t(
- "decidim.assemblies.admin.imports.attachment_error",
- title: attachment_title(file),
- error: format_error(e)
- )
- next
- end
-
Decidim.traceability.perform_action!("create", Attachment, @user) do
attachment = Attachment.new(
title: file["title"],
description: file["description"],
- content_type: file_tmp.content_type,
attached_to: @imported_assembly,
- weight: file["weight"],
- file: file_tmp, # Define attached_to before this
- file_size: file_tmp.size
+ weight: file["weight"]
)
+ begin
+ attachment.attached_uploader(:file).remote_url = url
+ attachment.set_content_type_and_size
+ rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+ @warnings << I18n.t(
+ "decidim.assemblies.admin.imports.attachment_error",
+ title: attachment_title(file),
+ error: format_error(e)
+ )
+ next
+ end
attachment.create_attachment_collection(file["attachment_collection"])
attachment.save!
attachment
@@ -180,14 +175,6 @@ def import_hero_image(url)
@warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
end
- def import_banner_image(url)
- return if url.blank?
-
- @imported_assembly.attached_uploader(:banner_image).remote_url = url
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
- end
-
def format_error(error)
return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
index a6dcfb2f4c0f5..4a5b77bb6aad2 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
@@ -12,7 +12,6 @@ def serialize
url: EngineRouter.main_proxy(resource).assembly_url(resource),
subtitle: resource.subtitle,
remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
- remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
developer_group: resource.developer_group,
local_area: resource.local_area,
meta_scope: resource.meta_scope,
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 861ca7914d867..e176aa7db01cd 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -98,10 +98,6 @@
<%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
-
-
- <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
index d6ed716e4f028..41801f6c9ac24 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index faa12dc4037a2..f8aa07760af84 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if parent_assembly && parent_assembly.self_and_ancestors.length %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
index 41626d1357ee0..1434001b85107 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
@@ -6,7 +6,7 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
);
// Dispatch the `ajax:loaded` event with the newly inserted element
-const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+var insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
var component = new window.Decidim.AdminAssembliesListComponent();
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
index f98ba34f2a9bc..097a30bc1b2f3 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
index d08339df210cd..95e2ade99b9dc 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.new.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
index 18f2eca3dc5c9..dea867b78ac4e 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index b5d593aa340de..f54582cc75785 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
index 45d96fe525a54..b271eed7173f4 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
index aad6260fb5fcd..1afef5e5df6e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :assembly_user_role %>
<%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
index 570517cea9aa0..765c729002a52 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 3fb3b7d068099..6bafa56d3e0ce 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
<% add_decidim_meta_tags(
title: translated_attribute(current_participatory_space.title),
resource: current_participatory_space) %>
@@ -11,13 +11,14 @@ edit_link(
)
%>
-<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
-
-
- <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
- <%= collection.size %>
-
-
+<% content_for :aside do %>
+
+ <%= t("members", scope: "decidim.participatory_space_members.index") %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
<%= render(collection) %>
-
-
+
+<% end %>
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 9e01c707a6196..cd68e71cb2001 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -107,11 +107,8 @@ en:
public: Public
published: Published
unpublished: Unpublished
- manage_trash:
- title: Deleted assemblies
new:
create: Create
- title: New assembly
update:
error: There was a problem updating this assembly.
success: Assembly successfully updated.
@@ -123,7 +120,6 @@ en:
new:
duplicate: Duplicate
select: Select which data you would like to duplicate
- title: Duplicate assembly
assembly_imports:
create:
error: There was a problem importing this assembly.
@@ -131,7 +127,6 @@ en:
new:
import: Import
select: Select which data you would like to import
- title: Import assembly
assembly_publications:
create:
error: There was a problem publishing this assembly.
@@ -146,13 +141,9 @@ en:
destroy:
success: Admin successfully removed from this assembly.
edit:
- title: Update assembly admin
update: Update
- index:
- assembly_admins_title: Assembly admins
new:
create: Create
- title: New assembly admin
update:
error: There was a problem updating an admin for this assembly.
success: Admin updated successfully for this assembly.
@@ -210,8 +201,6 @@ en:
space_filter_for:
assemblies: All assemblies
titles:
- assemblies: Assemblies
- assemblies_deleted: Deleted assemblies
assemblies_types: Assemblies types
tooltips:
deleted_assemblies_info: An assembly can only be deleted if status is "Unpublished".
@@ -247,6 +236,8 @@ en:
assemblies:
admin:
assemblies:
+ edit:
+ title: About this assembly
form:
define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
duration: Duration
@@ -265,24 +256,40 @@ en:
taxonomies: Taxonomies
title: General Information
visibility: Visibility
+ index:
+ title: Assemblies
+ manage_trash:
+ title: Deleted assemblies
+ new:
+ title: New assembly
assembly_duplicates:
form:
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Duplicate assembly
assembly_imports:
form:
document_legend: Add a document
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Import assembly
assembly_members:
form:
explanation: 'Guidance for image:'
image_guide: Preferably a portrait image that does not have any text.
non_user_avatar_help: You should get the consent of the persons before publishing them as a member.
+ assembly_user_roles:
+ edit:
+ title: Update assembly admin
+ index:
+ title: Assembly admins
+ new:
+ title: New assembly admin
content_blocks:
highlighted_assemblies:
max_results: Maximum amount of elements to show
imports:
attachment_error: The attachment "%{title}" could not be imported (%{error}).
- banner_image_error: The banner image could not be imported (%{error}).
hero_image_error: The hero image could not be imported (%{error}).
new_import:
accepted_types:
@@ -311,9 +318,6 @@ en:
type: Type
show:
title: About this assembly
- assembly_members:
- index:
- members: Members
content_blocks:
children_assemblies:
name: Assemblies
@@ -355,9 +359,6 @@ en:
duration: Duration
private_space: This is a private assembly
social_networks_title: Visit assembly on
- assembly_members:
- index:
- title: Members
download_your_data:
show:
assemblies: Assemblies export
diff --git a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
index f5dbd012845c8..063ce22662adc 100644
--- a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
+++ b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
@@ -7,10 +7,10 @@ def change
# required so that test suite works in ci env
enable_extension "ltree"
rescue StandardError
- raise <<-MSG.squish
- Decidim requires the ltree extension to be enabled in your PostgreSQL.
- You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
- super user.
+ raise <<~MSG.squish
+ Decidim requires the ltree extension to be enabled in your PostgreSQL.
+ You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+ super user.
MSG
end
end
diff --git a/decidim-assemblies/lib/decidim/api/assembly_type.rb b/decidim-assemblies/lib/decidim/api/assembly_type.rb
index 1405d7e2aec10..5205f6f7cecab 100644
--- a/decidim-assemblies/lib/decidim/api/assembly_type.rb
+++ b/decidim-assemblies/lib/decidim/api/assembly_type.rb
@@ -17,7 +17,6 @@ class AssemblyType < Decidim::Api::Types::BaseObject
description "An assembly"
- field :banner_image, String, "The banner image for this assembly", null: true
field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
field :children_count, Integer, "Number of children assemblies", null: true
field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
@@ -64,10 +63,6 @@ def url
def hero_image
object.attached_uploader(:hero_image).url
end
-
- def banner_image
- object.attached_uploader(:banner_image).url
- end
end
end
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ebd08fba721d4..2f20677f1623e 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -42,13 +42,12 @@ class Engine < ::Rails::Engine
end
get "/assemblies", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies"
}
get "/assemblies/*rest", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
-
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies/#{params[:rest]}"
}
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/seeds.rb b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
index 4667312ad2f4a..4900aa839bd20 100644
--- a/decidim-assemblies/lib/decidim/assemblies/seeds.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
@@ -60,7 +60,6 @@ def create_assembly!(parent: nil)
end,
organization:,
hero_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? hero_image : nil, # Keep after organization
- banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
promoted: true,
published_at: 2.weeks.ago,
meta_scope: Decidim::Faker::Localized.word,
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index cefe5ad3d9a55..b46807b899ffc 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -27,7 +27,6 @@
description { generate_localized_description(:assembly_description, skip_injection:) }
organization
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
- banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
published_at { Time.current }
deleted_at { nil }
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index 5b175f3ee64f9..e4952a91aa401 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -18,7 +18,6 @@ module Decidim::Assemblies
end
let(:related_process_ids) { [participatory_processes.map(&:id)] }
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:taxonomizations) do
2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
end
@@ -34,7 +33,6 @@ module Decidim::Assemblies
slug: "slug",
meta_scope: { en: "meta scope" },
hero_image:,
- banner_image:,
promoted: nil,
developer_group: { en: "developer group" },
local_area: { en: "local" },
@@ -87,7 +85,6 @@ module Decidim::Assemblies
content_type: "image/jpeg"
)
end
- let(:banner_image) { hero_image }
before do
allow(Decidim::ActionLogger).to receive(:log).and_return(true)
@@ -99,7 +96,6 @@ module Decidim::Assemblies
it "adds errors to the form" do
expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
- expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
subject.call
end
end
@@ -112,14 +108,12 @@ module Decidim::Assemblies
content_type: "image/png"
)
end
- let(:banner_image) { nil }
let(:form) do
Admin::AssemblyForm.from_params(
title: { en: "title" },
subtitle: { en: "subtitle" },
slug: "slug",
hero_image:,
- banner_image:,
description: { en: "description" },
short_description: { en: "short_description" },
organization:
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..ee9b46ea875d5 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -44,10 +44,6 @@ def stub_calls_to_external_files
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 384d61f6e9732..0af3499198faa 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
2.times.map { create(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: my_assembly) }
end
let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
- let(:banner_image) { my_assembly.banner_image }
let(:params) do
{
assembly: {
@@ -69,8 +68,7 @@ module Decidim::Assemblies
end
let(:attachment_params) do
{
- hero_image: hero_image.blob,
- banner_image: banner_image.blob
+ hero_image: hero_image.blob
}
end
let(:context) do
@@ -105,7 +103,6 @@ module Decidim::Assemblies
context "when the uploaded hero image has too large dimensions" do
let(:attachment_params) do
{
- banner_image: banner_image.blob,
hero_image: ActiveStorage::Blob.create_and_upload!(
io: File.open(Decidim::Dev.asset("5000x5000.png")),
filename: "5000x5000.png",
@@ -125,7 +122,6 @@ module Decidim::Assemblies
allow(form).to receive(:invalid?).and_return(false)
expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
my_assembly.errors.add(:hero_image, "File resolution is too large")
- my_assembly.errors.add(:banner_image, "File resolution is too large")
end
it "broadcasts invalid" do
@@ -136,7 +132,6 @@ module Decidim::Assemblies
command.call
expect(form.errors[:hero_image]).not_to be_empty
- expect(form.errors[:banner_image]).not_to be_empty
end
end
@@ -176,14 +171,12 @@ module Decidim::Assemblies
expect(linked_participatory_processes).to match_array(participatory_processes)
end
- context "when homepage image is not updated" do
+ context "when hero image is not updated" do
let(:attachment_params) do
- {
- banner_image: banner_image.blob
- }
+ {}
end
- it "does not replace the homepage image" do
+ it "does not replace the hero image" do
expect(my_assembly).not_to receive(:hero_image=)
command.call
@@ -193,23 +186,6 @@ module Decidim::Assemblies
end
end
- context "when banner image is not updated" do
- let(:attachment_params) do
- {
- hero_image: hero_image.blob
- }
- end
-
- it "does not replace the banner image" do
- expect(my_assembly).not_to receive(:banner_image=)
-
- command.call
- my_assembly.reload
-
- expect(my_assembly.banner_image).to be_present
- end
- end
-
context "when updating the parent assembly" do
let!(:parent_assembly) { create(:assembly, organization:) }
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index cb707515ee6db..6b37e015f9025 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -120,7 +120,6 @@ module Admin
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
"hero_image" => attachment,
- "banner_image" => attachment,
"slug" => slug,
"private_space" => private_space,
"has_members" => has_members,
@@ -185,7 +184,7 @@ module Admin
it { is_expected.not_to be_valid }
end
- context "when attachment (hero_image or banner_image) is too big" do
+ context "when attachment (hero_image) is too big" do
before do
organization.settings.tap do |settings|
settings.upload.maximum_file_size.default = 5
@@ -298,7 +297,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
@@ -351,7 +349,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index e4e50af28d4ad..dc43eac7cab3d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -12,26 +12,17 @@ module Decidim
describe "when no images were uploaded" do
before do
assembly.hero_image.purge
- assembly.banner_image.purge
end
it "return nil for hero_image_url" do
expect(subject.hero_image_url).to be_nil
end
-
- it "return nil for banner_image_url" do
- expect(subject.banner_image_url).to be_nil
- end
end
describe "when images are attached" do
it "resolves hero_image_url" do
expect(subject.hero_image_url).to be_blob_url(assembly.hero_image.blob)
end
-
- it "resolves banner_image_url" do
- expect(subject.banner_image_url).to be_blob_url(assembly.banner_image.blob)
- end
end
end
end
diff --git a/decidim-assemblies/spec/requests/redirect_routes_spec.rb b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
new file mode 100644
index 0000000000000..ad28fe824faf9
--- /dev/null
+++ b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Redirect routes" do
+ let(:organization) { create(:organization, available_locales: %w(en es ca), default_locale: "en") }
+ let(:headers) { { "HOST" => organization.host } }
+
+ it "redirects old url with missing locale" do
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale" do
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+
+ it "redirects to default locale when the locale is invalid" do
+ get("/assemblies?locale=esp", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale and additional params" do
+ get("/assemblies/foo-bar?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies/foo-bar")
+ end
+
+ it "redirects user to the new url" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/ca/assemblies")
+ end
+
+ it "redirects user to the new url when using custom locale" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index f7c15cbab8bc3..50e7761e4d336 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -51,12 +51,10 @@ module Decidim::Assemblies
"created_by" => "citizens",
"meta_scope" => Decidim::Faker::Localized.sentence(word_count: 3),
"announcement" => Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title },
- "remote_hero_image_url" => hero_image_url,
- "remote_banner_image_url" => banner_image_url
+ "remote_hero_image_url" => hero_image_url
}
end
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly correctly" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
@@ -139,95 +137,22 @@ module Decidim::Assemblies
end
end
- context "when banner image URL is present and accessible" do
- let(:banner_image_url) { "http://example.com/banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, banner_image_url)
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
- end
-
- it "imports the assembly with the banner image" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- expect(subject.banner_image).to be_attached
- end
-
- it "has no warnings" do
- subject
- expect(importer.warnings).to be_empty
- end
- end
-
- context "when banner image URL returns 404 error" do
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "does not attach the banner image" do
- subject
- expect(subject.banner_image).not_to be_attached
- end
-
- it "collects a warning about the missing banner image" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported \(404 Not Found\)\./i))
- end
- end
-
- context "when both hero and banner images fail to import" do
- let(:hero_image_url) { "http://example.com/missing-hero.jpg" }
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, hero_image_url).to_return(status: 404)
- stub_request(:head, hero_image_url).to_return(status: 404)
- stub_request(:get, banner_image_url).to_return(status: 500)
- stub_request(:head, banner_image_url).to_return(status: 500)
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "collects warnings for both images" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The hero image could not be imported/i))
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported/i))
- expect(importer.warnings.length).to eq(2)
- end
- end
-
context "when image URL is nil" do
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
context "when image URL is empty string" do
let(:hero_image_url) { "" }
- let(:banner_image_url) { "" }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
@@ -311,6 +236,114 @@ module Decidim::Assemblies
expect(importer.warnings).to include(a_string_matching(/The attachment "Test File" could not be imported \(500 Internal Server Error\)\./i))
end
end
+
+ context "when remote file is accessible and downloadable (PDF)" do
+ let(:remote_file_url) { "http://example.com/document.pdf" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ expect(attachment.file.filename.to_s).to eq("document.pdf")
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("application/pdf")
+ end
+
+ it "sets the file size automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file_size).to be_present
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file is accessible and downloadable (image)" do
+ let(:remote_file_url) { "http://example.com/image.jpg" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("image/jpeg")
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file URL is blank" do
+ let(:attachments_data) do
+ {
+ "files" => [
+ {
+ "title" => { "en" => "Test File" },
+ "description" => { "en" => "Test Description" },
+ "weight" => 1,
+ "remote_file_url" => ""
+ }
+ ],
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
+
+ context "when files array is nil" do
+ let(:attachments_data) do
+ {
+ "files" => nil,
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
end
end
end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 57ec9cb121f86..2577d2432fb03 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
index 9d07c6c3d027c..baee2322438b5 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
@@ -23,7 +23,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index c4a4409979ba0..c98bd31acad1e 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -18,7 +18,7 @@
it "updates an assembly" do
fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
- dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
+ dynamically_attach_file(:assembly_hero_image, image3_path, remove_before: true)
within ".edit_assembly" do
expect(assembly_parent_id_options).not_to include(assembly.id)
@@ -84,12 +84,6 @@
src = page.find("img")["src"]
expect(src).to be_blob_url(hero_blob)
end
-
- banner_blob = assembly.hero_image.blob
- within %([data-active-uploads] [data-filename="#{banner_blob.filename}"]) do
- src = page.find("img")["src"]
- expect(src).to be_blob_url(banner_blob)
- end
end
end
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index f365f2fb79242..8d59e9521f705 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -29,10 +29,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
@@ -115,10 +111,6 @@
.to_return(status: 404, body: "Not Found")
stub_request(:head, "http://example.com/missing-hero.jpg")
.to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
within_admin_menu do
click_on "Import"
@@ -149,115 +141,7 @@
end
end
- context "when banner image URL returns 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 banner",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-banner"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows a warning about the missing banner image" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 banner")
-
- within ".flash.warning" do
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both hero and banner image URLs return 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_hero_image_url"] = "http://example.com/missing-hero.jpg"
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 images",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-both"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows warnings for both missing images" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 images")
-
- within ".flash.warning" do
- expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both image URLs are too long and return 404" do
+ context "when hero image URL is too long and returns 404" do
let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
let(:json_file) do
Tempfile.new(["assemblies", ".json"]).tap do |file|
@@ -269,20 +153,14 @@
Rack::Test::UploadedFile.new(json_file.path, "application/json")
end
let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
- let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
before do
json_data.first["remote_hero_image_url"] = hero_image_url
- json_data.first["remote_banner_image_url"] = banner_image_url
stub_request(:get, hero_image_url)
.to_return(status: 404, body: "Not Found")
stub_request(:head, hero_image_url)
.to_return(status: 404, body: "Not Found")
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
within_admin_menu do
click_on "Import"
@@ -303,13 +181,12 @@
click_on "Import"
end
- it "imports successfully and shows warnings for both missing images" do
+ it "imports successfully and shows warnings for missing hero image" do
expect(page).to have_callout("Assembly successfully imported.")
expect(page).to have_callout("Import assembly with long 404 images")
within ".flash.warning" do
expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
end
end
end
@@ -338,10 +215,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
within_admin_menu do
click_on "Import"
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 9e945e03285ca..e23ed6837013a 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -86,7 +86,6 @@
end
dynamically_attach_file(:assembly_hero_image, image1_path)
- dynamically_attach_file(:assembly_banner_image, image2_path)
within ".new_assembly" do
find("*[type=submit]").click
@@ -111,15 +110,11 @@
visit decidim_admin_assemblies.assemblies_path
end
- it "update a participatory process without images does not delete them" do
+ it "update an assembly without images does not delete them" do
within "tr", text: translated(assembly3.title) do
click_on translated(assembly3.title)
end
- within_admin_sidebar_menu do
- click_on "About this assembly"
- end
-
select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
click_on "Update"
@@ -135,6 +130,18 @@
expect(src).to be_blob_url(hero_blob)
end
end
+
+ describe "when the assembly is transparent" do
+ let!(:assembly3) { create(:assembly, :private, :transparent, organization:) }
+
+ it "shows the transparent checkbox correctly" do
+ within "tr", text: translated(assembly3.title) do
+ click_on translated(assembly3.title)
+ end
+
+ expect(page).to have_checked_field("assembly_is_transparent")
+ end
+ end
end
context "when managing parent assemblies" do
@@ -195,4 +202,61 @@
end
end
end
+
+ context "when navigating grandchild assemblies (3rd level)" do
+ let!(:grandmother_assembly) { create(:assembly, organization:) }
+ let!(:mother_assembly) { create(:assembly, organization:, parent: grandmother_assembly) }
+ let!(:child_assembly) { create(:assembly, :with_content_blocks, organization:, parent: mother_assembly) }
+ let(:assembly) { child_assembly }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ visit decidim_admin_assemblies.assemblies_path
+ end
+
+ describe "listing grandchild assemblies" do
+ it "expands both parent and grandparent assemblies to show child" do
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(child_assembly.title))
+
+ # Opens actions dropdown in child
+ find("button[data-target='actions-assembly-#{child_assembly.id}']").click
+ expect(page).to have_content("Edit")
+ expect(page).to have_content("Share link")
+ expect(page).to have_content("Export")
+
+ # Collapse mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(child_assembly.title))
+ expect(page).to have_content(translated(mother_assembly.title))
+
+ # Collapse grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+ end
+ end
+ end
end
diff --git a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
index a52d4aaefbcf5..1749135152554 100644
--- a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
@@ -5,12 +5,11 @@
describe "Social shares" do
let(:organization) { create(:organization) }
- let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:, banner_image:) }
+ let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:) }
let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
let!(:attachment) { create(:attachment, :with_image, attached_to: assembly, file: attachment_file) }
let(:description) { { en: "Description
" } }
let(:short_description) { { en: "Description
" } }
- let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
@@ -44,19 +43,11 @@
context "when no hero_image" do
let(:hero_image) { nil }
- it_behaves_like "a social share meta tag", "city.jpeg"
- end
-
- context "when no direct images" do
- let(:hero_image) { nil }
- let(:banner_image) { nil }
-
it_behaves_like "a social share meta tag", "city3.jpeg"
end
context "when no attachments nor direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
it_behaves_like "a social share meta tag", "description_image.jpg"
@@ -70,7 +61,6 @@
context "when no attachments, description image or direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
@@ -80,7 +70,6 @@
context "when nothing" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index a59648ec90844..c197eb01dd68c 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -83,14 +83,6 @@ module Assemblies
end
end
- describe "bannerImage" do
- let(:query) { "{ bannerImage }" }
-
- it "returns the banner image field" do
- expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
- end
- end
-
describe "promoted" do
let(:query) { "{ promoted }" }
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 506a9bf3b697c..fdedb5a24c0fb 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -77,7 +77,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -200,7 +199,6 @@
it "returns the correct response" do
data = response["assemblies"].first
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
@@ -231,7 +229,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -344,7 +341,6 @@
it "returns the correct response" do
data = response["assembly"]
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index dea863457fd7f..0af90d0f23945 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -26,7 +26,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +48,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index aeffda5c91004..3a7aecce62871 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -36,7 +36,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -58,7 +58,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
@@ -97,11 +97,8 @@ def posts
end
end
- # PROVISIONAL if we implement counter cache
def posts_most_commented
- @posts_most_commented ||= posts.joins(:comments).group(:id)
- .select("count(decidim_comments_comments.id) as counter")
- .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
+ @posts_most_commented ||= posts.order(comments_count: :desc).published_at_desc.limit(7)
end
def add_breadcrumb_item
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 38c74550bb540..c1c1801729431 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -38,7 +38,7 @@ class Post < Blogs::ApplicationRecord
D: :body,
datetime: :created_at
},
- index_on_create: true,
+ index_on_create: ->(post) { post.visible? },
index_on_update: ->(post) { post.visible? })
class << self
diff --git a/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
new file mode 100644
index 0000000000000..322bc8361847d
--- /dev/null
+++ b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages component publication" do
+ include_context "when managing a component as an admin" do
+ let!(:resource) { create(:post, :published, component:) }
+
+ context "when cycling through publication states" do
+ let!(:component) { create(:post_component, participatory_space:) }
+
+ include_examples "cycling through publication states"
+ end
+
+ context "when component is unpublished, and admin publishes" do
+ let!(:component) { create(:post_component, :unpublished, participatory_space:) }
+
+ include_examples "add component resources to search index"
+ end
+
+ context "when component is published, and admin unpublishes" do
+ let!(:component) { create(:post_component, :published, participatory_space:) }
+
+ include_examples "removes component resources from search index"
+ end
+ end
+end
diff --git a/decidim-blogs/spec/system/admin_publishes_component_spec.rb b/decidim-blogs/spec/system/admin_publishes_component_spec.rb
deleted file mode 100644
index 734951b434d63..0000000000000
--- a/decidim-blogs/spec/system/admin_publishes_component_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin publishes component" do
- let(:manifest_name) { "blogs" }
- let!(:resource) { create(:post, component:) }
-
- include_context "when publishing and unpublishing the component"
- include_context "when cycling through publication states"
-end
diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
index e5f196d91df65..5167807fcb88a 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
@@ -35,7 +35,8 @@ def progress_budgets
end
def non_voted_budgets
- budgets.where.not(id: voted.map(&:id))
+ budgets_to_exclude = progress_budgets + voted
+ budgets.where.not(id: budgets_to_exclude.map(&:id))
end
def highlighted?
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..bd80489593723 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class CreateProject < Decidim::Commands::CreateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..522afcf3e0697 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class UpdateProject < Decidim::Commands::UpdateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
def initialize(form, project)
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
index 41dc4fcfe8b1b..a2f334d877695 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
@@ -6,6 +6,7 @@ module Admin
# This controller allows the create or update a budget.
class BudgetsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
+
helper_method :budgets, :budget, :finished_orders, :pending_orders,
:users_with_pending_orders, :users_with_finished_orders
@@ -26,7 +27,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +49,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 7eb5bd00861e6..e45f48995522a 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
include Decidim::Admin::ComponentTaxonomiesHelper
include Decidim::Budgets::Admin::Filterable
+
helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
helper Decidim::Budgets::ProjectsHelper
@@ -39,7 +40,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -62,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
index 22d03155470d7..a60f8ebcf6a9e 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
index 8b4b94a8342bb..dca3242383a8f 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
@@ -22,12 +22,12 @@ def create
AddLineItem.call(persisted_current_order, project, current_user) do
on(:ok) do |order|
self.current_order = order
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
@@ -38,12 +38,12 @@ def destroy
respond_to do |format|
RemoveLineItem.call(current_order, project) do
on(:ok) do |_order|
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 4918e044c4329..eb4b8f4425d82 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -16,7 +16,7 @@ class BudgetForm < Decidim::Form
validates :title, translatable_presence: true
validates :weight, numericality: { greater_than_or_equal_to: 0 }
- validates :total_budget, numericality: { greater_than: 0 }
+ validates :total_budget, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 339ab98e8968f..530e4099dac94 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -26,7 +26,7 @@ class ProjectForm < Decidim::Form
validates :title, translatable_presence: true
validates :description, translatable_presence: true
- validates :budget_amount, presence: true, numericality: { greater_than: 0 }
+ validates :budget_amount, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
validate :notify_missing_attachment_if_errored
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 9990eab6dddcb..e5dcb4b0015a9 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -134,14 +134,14 @@ def attachment_context
end
ransacker :confirmed_orders_count do
- query = <<-SQL.squish
- (
- SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
- FROM decidim_budgets_line_items
- LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
- WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
- AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
- )
+ query = <<~SQL.squish
+ (
+ SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+ FROM decidim_budgets_line_items
+ LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+ WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+ AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+ )
SQL
Arel.sql(query)
end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
index 70bf4c4dc4a39..b16297b1722a6 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
+<% add_decidim_page_title(t(".title", budget: decidim_sanitize_translated(budget.title))) %>
+
- <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+ <%= t(".title", budget: decidim_sanitize_translated(budget.title)) %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index ad4cef7763585..7c2f6e7f77309 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -3,7 +3,7 @@
+ <% if has_replies_in_children? %>
+ <%= render :replies %>
+ <% elsif can_reply? %>
+
+ <% end %>
<% end %>
<% if current_user.present? %>
<%= cell("decidim/report_button", model, modal_id: "flagModalComment#{model.id}").flag_modal %>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 4e0c60d16d97c..3c792e8a940b6 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -86,10 +86,6 @@ def comment_body
formatted_body
end
- def replies
- SortedComments.for(model, order_by: order)
- end
-
def order
options[:order] || "older"
end
@@ -234,7 +230,11 @@ def has_replies?
end
def has_replies_in_children?
- model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
+ replies_count.positive?
+ end
+
+ def replies_count
+ @replies_count ||= model.replies.count
end
# action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
index 9670e0ca5ee7c..78bbcedd57d47 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
@@ -31,7 +31,7 @@
<% end %>
">
- <%= t("authorization_workflows", scope: "decidim.admin.titles") %> + <%= t(".title") %>
<%= t(".title", name: user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/index.html.erb b/decidim-admin/app/views/decidim/admin/components/index.html.erb
index 8786950970980..4b41cdf758314 100644
--- a/decidim-admin/app/views/decidim/admin/components/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to?(:create, :component) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
index 9f57bccc47c3e..0b46cc872ac06 100644
--- a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
index c66b11589e51f..a1c415ffdacb2 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
- Transfer User
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
index 16117766de80e..392d6b569586b 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("title", scope: "decidim.admin.conflicts") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
index 858a3445a11e8..b3a7ec5cc863f 100644
--- a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+ <%= t(".title") %> <%= current_organization_name %>
@@ -46,6 +46,6 @@
<% end %>
<% if current_user.admin_terms_accepted? %>
- <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+ <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
deleted file mode 100644
index 77839a7a15cdf..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We are contacting you to notify you that your password has been changed.
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
deleted file mode 100644
index 708edf07be4be..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to "Change my password", edit_password_url(@resource, reset_password_token: @token) %>
-
-If you did not request this, please ignore this email.
-Your password will not change until you access the link above and create a new one.
diff --git a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
index 6e05cc045575a..31d11247ac7d7 100644
--- a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
+++ b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render partial: "form", object: @form %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
index 2fab7a6d3c532..65649997871f4 100644
--- a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if current_organization.available_authorizations.empty? %>
<%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
- <%= t "decidim.admin.titles.impersonatable_users" %>
+ <%= t ".title" %>
<% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
<%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
index cce55b1bec168..ebd237dbf6062 100644
--- a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if creating_managed_user? %>
- <%= t(".impersonate_new_managed_user") %>
+ <%= t(".title") %>
<% else %>
<% if @form.user.managed? %>
<%= t(".impersonate_existing_managed_user", name: @form.user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
index bdf151be9c30f..14a53b52b2894 100644
--- a/decidim-admin/app/views/decidim/admin/imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
<%= import_manifest.message(:title, self) %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
index cbac48cb47b9e..d85d0543b147f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.admin_log" %>
+ <%= t "decidim.admin.logs.index.title" %>
<%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/index.html.erb b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
index b08e5fe4f8509..7af432ec8134f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
<%= decidim_paginate logs %>
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 c1dfb56faae16..28a5487da2c1f 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
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.impersonations" %>
+ <%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
index c890a31d0ec2a..8df79d3c485e8 100644
--- a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".new_managed_user_promotion") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
index 66599d17432ae..23891cac94b7e 100644
--- a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
- <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+ <%= t ".title", template_name: t(template_manifest.public_name_key) %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
index 362cdd1ffd248..ff6c3600f26aa 100644
--- a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t ".preview" %>
+ <%= t ".title" %>
<% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
index a190d5bed569a..c1f179dbe0460 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
-
+
- <%= t "decidim.admin.titles.participants" %>
+
+ <%= t ".title" %>
+
<%= admin_filter_selector %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..3c306de596edb 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= link_to user.email, "mailto:#{user.email}" %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
index 2ea4feeda353e..dc82f699dd6a0 100644
--- a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("title", scope: "decidim.admin.organization_external_domain_allowlist.form") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
index c6cee2d5210a3..63ab9ef2ce1ee 100644
--- a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -1,4 +1,11 @@
-
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+
+ <%= t ".title" %>
+
+
<%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
diff --git a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
index 4a789ab31623c..d34ec4631dddb 100644
--- a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.scope_types" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :scope_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
diff --git a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
index 7730666b48870..6e3f35dd52160 100644
--- a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
@@ -1,11 +1,11 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
+<% add_decidim_page_title(t(".title")) %>
<% if parent_scope %>
<%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
<% else %>
- <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
+ <%= t ".title" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
index e0b5e3b720961..4e498e12c866f 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", name: resource_title)) %>
+
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
index f099e67eb7fee..238768df7415a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
@@ -1,5 +1,3 @@
-<% add_decidim_page_title(content_blocks_title) %>
-
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
index 36d0aabb9a743..e19a0d32d8ab2 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(content_blocks_title) %>
+
<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
index 3f330918d7615..8ce44f19debee 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(content_block.public_name_key)) %>
+
<%= t content_block.public_name_key %>
diff --git a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
index 023a2d6b92fbc..bcc6f0405309c 100644
--- a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("page_topics", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
index c44814f1a7da1..6c7faa224edd4 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
+
<%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
index 7cc99a8881e32..6fe5a6a8eeb07 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("pages", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :static_page %>
<%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
index 85b867615d752..9dbec1682d5d9 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.statistics" %>
+ <%= t "decidim.admin.statistics.index.title" %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
index 209083c2d9cb2..c846c90b461a3 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render(
partial: "decidim/admin/statistics/statistics",
locals: {
diff --git a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
index f206951a7af75..9cb6426932777 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("taxonomies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.taxonomies" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_taxonomy"), new_taxonomy_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
index d4e0d04a5848d..fa0dd723d2d63 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name))) %>
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(root_taxonomy.name))) %>
- <%= t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name)) %>
+ <%= t(".title", taxonomy: translated_attribute(root_taxonomy.name)) %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_filter"), new_taxonomy_filter_path(root_taxonomy), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
index ec88de7a2a715..8d2fc0f61787d 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render "decidim/admin/taxonomy_filters_selector/taxonomies_select" %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
index 07c677b1a2def..a146049a944e5 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= button_tag class: "button button__secondary button__sm", id: "save-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
index b70d48b8c69f0..389dfd7ce688e 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= link_to decidim_admin.taxonomy_filters_selector_path(taxonomy_filter_id: taxonomy_filter.id, taxonomy_id: root_taxonomy.id, component_id: component.id), remote: true, method: :delete, class: "button button__transparent-secondary button__sm", id: "remove-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
index 56332917d60e4..e77108030c23c 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_item_path(taxonomy_id: taxonomy.id, id: taxonomy_item.id ), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
index b2a4c43a91f36..594d58931c768 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_items_path(taxonomy), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/users/index.html.erb b/decidim-admin/app/views/decidim/admin/users/index.html.erb
index 3d26b0a64acb8..3306f63c147c9 100644
--- a/decidim-admin/app/views/decidim/admin/users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.users" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :admin_user %>
<%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 0d554d179ab7e..2375605ebb12d 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -208,6 +208,9 @@ en:
user:
new: New admin
view_deleted_components: View deleted components
+ admin_terms:
+ show:
+ title: Admin terms of service
admin_terms_of_service:
accept:
error: There was a problem while accepting the admin terms of service.
@@ -221,7 +224,6 @@ en:
alert: 'Required: Review our admin terms of service'
callout: Please take a moment to review the admin terms of service. Otherwise you will not be able to manage the platform.
cta: Review them now.
- title: Admin terms of service
area_types:
create:
error: There was a problem creating a new area type.
@@ -231,6 +233,8 @@ en:
edit:
title: Edit area type
update: Update
+ index:
+ title: Area types
new:
create: Create area type
title: New area type
@@ -248,6 +252,8 @@ en:
edit:
title: Edit area
update: Update
+ index:
+ title: Areas
new:
create: Create area
title: New area
@@ -265,7 +271,7 @@ en:
title: Edit folder
update: Update
index:
- attachment_collections_title: Attachment folders
+ title: Attachment folders
new:
create: Create
title: New folder
@@ -282,7 +288,7 @@ en:
title: Edit attachment
update: Update
index:
- attachments_title: Attachments
+ title: Attachments
new:
create: Create attachment
title: New attachment
@@ -291,6 +297,9 @@ en:
success: Attachment updated successfully.
attachments_privacy_warning:
message: Be careful when working with attachments in a private space. Any participant could share this document to others.
+ authorization_workflows:
+ index:
+ title: Verification methods
autocomplete:
no_results: No results found
search_prompt: Type at least three characters to search.
@@ -335,6 +344,7 @@ en:
name: Component name
type: Component type
visibility: Visibility
+ title: Components
manage_trash:
title: Deleted components
new:
@@ -342,7 +352,6 @@ en:
title: 'Add component: %{name}'
publish:
success: The component has been successfully published.
- title: Components
unpublish:
success: The component has been successfully unpublished.
update:
@@ -354,12 +363,14 @@ en:
unpublished: Unpublished
conflicts:
attempts: Attempts
+ edit:
+ title: Transfer User
'false': 'No'
index:
text: Search by current user email, name or nickname
+ title: Verification conflicts
managed_user_name: Managed User
solved: Solved
- title: Verification conflicts
transfer:
email: Email
error: There was a problem transferring the current participant to managed participant.
@@ -392,6 +403,7 @@ en:
title: Pending Moderations
show:
dropdown: Dropdown
+ title: Dashboard
view_more_logs: View more logs
domain_allowlist:
form:
@@ -488,6 +500,8 @@ en:
form:
save: Save
success: Help sections updated successfully.
+ update:
+ title: Help sections
impersonatable_users:
index:
filter:
@@ -503,6 +517,7 @@ en:
promote: Promote
search: Search
status: Status
+ title: Manageable participants
view_logs: View logs
impersonations:
close_session:
@@ -519,7 +534,7 @@ en:
impersonate: Impersonate
impersonate_existing_managed_user: Manage participant "%{name}"
impersonate_existing_user: Manage participant "%{name}"
- impersonate_new_managed_user: Manage new participant
+ title: Impersonate participant
imports:
and: and
data_errors:
@@ -563,20 +578,25 @@ en:
participatory_space: Find participatory space
text: Search by user email, name or nickname
user: User
+ index:
+ title: Admin log
logs_list:
no_logs_yet: There are no logs yet.
no_matching_logs: There are no logs with the provided search filters. Try to change them and retry.
manage_trash:
deleted_items_warning: You are currently viewing deleted items. To make any edits or changes, you must first restore them.
managed_users:
+ impersonation_logs:
+ index:
+ title: Impersonations
promotion:
error: There was a problem promoting the managed participant.
success: The managed participant has been successfully promoted.
promotions:
new:
explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
- new_managed_user_promotion: New managed participant promotion
promote: Promote
+ title: New managed participant promotion
members:
create:
error: There was a problem adding a member for this participatory space.
@@ -805,7 +825,7 @@ en:
title: Newsletter templates
use_template: Use this template
show:
- preview: 'Preview template: %{template_name}'
+ title: 'Preview template: %{template_name}'
use_template: Use this template
newsletters:
confirm_recipients:
@@ -870,10 +890,10 @@ en:
send_to_user:
sent_successfully: Newsletter has been sent successfully to %{email}
show:
- preview: Preview
select_recipients_to_deliver: Select recipients to deliver
send_me_a_test_email: Send me a test email
subject: Subject
+ title: Preview
update:
error: There was a problem updating this newsletter.
success: Newsletter updated successfully. Please review it before sending.
@@ -907,12 +927,15 @@ en:
send_message: Send message
show_email: Show email
status: Status
+ title: Participants
unblock: Unblock
unofficialize: Unofficialize
new:
badge: Officialization badge
officialize: Officialize
title: Officialize participant "%{name}"
+ show_email:
+ title: Show email
show_email_modal:
description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
email_address: Email address
@@ -957,6 +980,7 @@ en:
success: Organization updated successfully.
organization_external_domain_allowlist:
edit:
+ title: Allowed list of external domains
update: Update
external_domain:
down: Down
@@ -965,7 +989,6 @@ en:
up: Up
form:
add: Add to allowed list
- title: Allowed list of external domains
reminders:
create:
error: There was a problem creating reminders.
@@ -974,6 +997,7 @@ en:
other: "%{count} users will be reminded."
new:
submit: Send
+ title: Send reminders
resource_permissions:
edit:
submit: Submit
@@ -991,6 +1015,8 @@ en:
edit:
title: Edit scope type
update: Update
+ index:
+ title: Scope types
new:
create: Create scope type
title: New scope type
@@ -1007,6 +1033,8 @@ en:
edit:
title: Edit scope
update: Update
+ index:
+ title: Scopes
new:
create: Create scope
title: New scope
@@ -1079,6 +1107,8 @@ en:
edit:
title: Edit topic
update: Update topic
+ index:
+ title: Topics
new:
create: New topic
title: New topic
@@ -1103,6 +1133,7 @@ en:
slug_help_html: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. Example: %{url}'
index:
last_notable_change: Last notable change
+ title: Pages
new:
create: New page
title: New page
@@ -1112,6 +1143,9 @@ en:
update:
error: There was a problem updating this page.
success: Page updated successfully.
+ statistics:
+ index:
+ title: Statistics
taxonomies:
actions:
actions: Actions
@@ -1142,6 +1176,7 @@ en:
description: Taxonomies and filters allow administrators to sort and organize content. For example, add a taxonomy with the city's districts and neighborhoods and then create filters only with the districts or for a specific neighborhood.
new_taxonomy: New taxonomy
no_items_found: No taxonomies found matching the search criteria.
+ title: Taxonomies
name: Name
new:
create: Create taxonomy
@@ -1186,6 +1221,7 @@ en:
description: A taxonomy filter allows admins to sort and filter participatory spaces based on a taxonomy. For example, add a taxonomy filter to sort processes by geographical scope.
empty: There are currently no taxonomy filters. Create a list of taxonomy filters here to sort and filter participatory spaces based on a taxonomy.
new_filter: New filter
+ title: Taxonomy filters for "%{taxonomy}"
new:
back: Back
create: Create taxonomy filter
@@ -1202,13 +1238,17 @@ en:
error: There was a problem updating this taxonomy filter.
success: Taxonomy filter updated successfully.
taxonomy_filters_selector:
+ index:
+ title: Taxonomy filters
new:
add_new_items_html: If you need to set a new filter or item, do it through the configuration settings or by clicking here.
items_count: "%{count} items"
save: Save
+ title: New taxonomy filter selector
show:
items_count: "%{count} items"
remove: Remove
+ title: Taxonomy filter selector
taxonomies_select:
filters: Filters
select_filter: Select a filter
@@ -1223,25 +1263,12 @@ en:
none: None
title: New item in %{taxonomy}
titles:
- admin_log: Admin log
- area_types: Area types
areas: Areas
authorization_workflows: Verification methods
- dashboard: Dashboard
- edit_external_domains: Allowed list of external domains
- impersonatable_users: Manageable participants
- impersonations: Participants management
menu: Menu
- page_topics: Topics
- pages: Pages
panel: Admin
- participants: Participants
- scope_types: Scope types
scopes: Scopes
statistics: Statistics
- taxonomies: Taxonomies
- taxonomy_filters: Taxonomy filters for "%{taxonomy}"
- users: Administrators
tooltips:
cannot_destroy_taxonomy_filter: Cannot destroy this taxonomy filter
cannot_edit_taxonomy_filter: Cannot edit this taxonomy filter
@@ -1265,6 +1292,8 @@ en:
email: Email
name: Name
role: Role
+ index:
+ title: Administrators
new:
create: Invite
title: Invite new administrator
@@ -1276,6 +1305,10 @@ en:
last_week: Last week
no_users_count_statistics_yet: There are no participant count statistics yet.
participants: Participants
+ components:
+ settings:
+ global:
+ taxonomy_filters_unavailable: Selecting taxonomy filters will be possible after the component is created.
forms:
errors:
impersonate_user:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index 2c6b77e359875..57a26599c651e 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "active_link_to", "~> 1.0"
s.add_dependency "decidim-core", version
- s.add_dependency "devise", "~> 4.7"
+ s.add_dependency "devise", ">= 4.7", "< 6.0"
s.add_dependency "devise-i18n", "~> 1.2"
s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
diff --git a/decidim-admin/lib/decidim/admin.rb b/decidim-admin/lib/decidim/admin.rb
index a7778ccba621b..652672dbd120a 100644
--- a/decidim-admin/lib/decidim/admin.rb
+++ b/decidim-admin/lib/decidim/admin.rb
@@ -15,8 +15,6 @@ module Admin
autoload :Import, "decidim/admin/import"
autoload :CustomImport, "decidim/admin/custom_import"
- include ActiveSupport::Configurable
-
# Public: Stores an instance of ViewHooks
def self.view_hooks
@view_hooks ||= ViewHooks.new
diff --git a/decidim-admin/lib/decidim/admin/menu.rb b/decidim-admin/lib/decidim/admin/menu.rb
index 0f92edad7f53c..011d5c7f77ccc 100644
--- a/decidim-admin/lib/decidim/admin/menu.rb
+++ b/decidim-admin/lib/decidim/admin/menu.rb
@@ -48,7 +48,7 @@ def self.register_workflows_menu!
def self.register_impersonate_menu!
Decidim.menu :impersonate_menu do |menu|
menu.add_item :conflicts,
- I18n.t("title", scope: "decidim.admin.conflicts"),
+ I18n.t("title", scope: "decidim.admin.conflicts.index"),
decidim_admin.conflicts_path,
active: is_active_link?(decidim_admin.conflicts_path),
if: allowed_to?(:index, :impersonatable_user)
diff --git a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
index 67e0ec58d1624..adbb0a5cc694b 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
@@ -53,6 +53,7 @@
fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
click_on I18n.t("decidim.admin.block_user.new.action")
+ expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
expect(content.reload).to be_hidden
diff --git a/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
new file mode 100644
index 0000000000000..dc937e285ad5c
--- /dev/null
+++ b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::HomepageContentBlockCell, type: :cell do
+ controller Decidim::Admin::OrganizationHomepageController
+
+ subject { cell("decidim/admin/homepage_content_block", content_block).call }
+
+ let(:organization) { create(:organization) }
+ let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "renders the content block name" do
+ expect(subject).to have_content("Hero image")
+ end
+
+ it "renders a link to edit the content block" do
+ expect(subject).to have_link(href: /edit/)
+ end
+
+ it "renders a link to destroy the content block" do
+ expect(subject).to have_css('a[data-method="delete"][href*="/content_blocks/"]')
+ end
+
+ it "renders the drag handle" do
+ expect(subject).to have_css("[draggable=\"true\"]")
+ end
+
+ context "when content block is not persisted" do
+ let(:content_block) { build(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "does not render edit or destroy links" do
+ expect(subject).to have_no_link(href: %r{/content_blocks/\d+/edit$})
+ expect(subject).to have_no_css('a[data-method="delete"]')
+ end
+ end
+
+ context "when content block has no settings" do
+ let(:content_block) do
+ create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage)
+ end
+
+ it "does not render edit link" do
+ expect(subject).to have_no_link(href: /edit/)
+ end
+ end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index 1ca15f31bb0c5..903dc8d24465c 100644
--- a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -45,6 +45,19 @@ module Decidim::Admin::ParticipatorySpace
expect(members.count).to eq 1
end
+ it "creates the member only one time" do
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 0
+
+ subject.call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+
+ form = double(invalid?: false, email:, current_user:, name:, role:, published: false)
+ described_class.new(form, participatory_space, via_csv:).call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+ end
+
it "creates a new user with no application admin privileges" do
subject.call
expect(Decidim::User.last).not_to be_admin
diff --git a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
index 8b263c5f5a110..0d0425c9c6fff 100644
--- a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
+++ b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
@@ -33,7 +33,7 @@ module Admin
it "breadcrumbs are set" do
get :index
- expect(controller.helpers.breadcrumb_items).to eq([label: "Taxonomies", url: taxonomies_path])
+ expect(controller.helpers.breadcrumb_items).to eq([{ label: "Taxonomies", url: taxonomies_path }])
end
end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index 2010bb0ba5548..0b64b1d7fa75a 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -55,10 +55,23 @@ def render_input
expect(form).to receive(:select).with(
:test,
full_choices,
- options
+ options, { disabled: false }
)
render_input
end
+
+ context "when the field should be disabled" do
+ let(:options) { { include_blank: false, readonly: true, label: "A test" } }
+
+ it "is supported" do
+ expect(form).to receive(:select).with(
+ :test,
+ full_choices,
+ options.except(:readonly), { disabled: true }
+ )
+ render_input
+ end
+ end
end
describe "booleans" do
@@ -188,6 +201,18 @@ def render_input
expect(view).to receive(:render).with(partial: "decidim/admin/components/taxonomy_filters_drawer")
render_input
end
+
+ context "when component is not persisted" do
+ let(:second_component) { build(:dummy_component, participatory_space: current_participatory_space) }
+
+ before do
+ view.instance_variable_set(:@component, second_component)
+ end
+
+ it "renders a message indicating that the component is missing" do
+ expect(render_input).to include("Selecting taxonomy filters will be possible after the component is created.")
+ end
+ end
end
describe "help texts" do
diff --git a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
index a72d503bfa2e1..8d22a78dd64b5 100644
--- a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
+++ b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
@@ -19,7 +19,7 @@
end
it "show Admin log panel" do
- expect(page).to have_content(t("decidim.admin.titles.admin_log"))
+ expect(page).to have_content(t("decidim.admin.logs.index.title"))
end
context "when does not have Pending moderations" do
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index ef869626cbdb4..ff67be3186ad4 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -52,5 +52,130 @@
expect(page).to have_current_path "/admin/admin_terms/show"
end
+
+ it "displays admin password requirements" do
+ visit last_email_link
+
+ expect(page).to have_content("15 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email, the organization's host")
+ expect(page).to have_content("must be different from your old passwords")
+ end
+
+ it "rejects passwords that are too short for admin" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "short123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("password is too short")
+ end
+
+ it "rejects passwords containing the user's name" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "Fiorello123456789!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("is too similar to your name")
+ end
+
+ it "rejects passwords with less than 5 unique characters" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "aaaaaaaaaaaaaaa!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("does not have enough unique characters")
+ end
+ end
+
+ context "when inviting a regular user" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+
+ let!(:invited_user) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited User",
+ email: "invited_user@example.org"
+ },
+ inviter
+ )
+ end
+ end
+
+ it "displays regular user password requirements in help text" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+
+ it "allows accepting invitation with valid user password" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "invited_user"
+ fill_in :invitation_user_password, with: "decidim123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("Your password was set successfully. You are now signed in.")
+ expect(Decidim::User.find_by(email: "invited_user@example.org")).not_to be_admin
+ end
+ end
+
+ context "when admin_password_strong is disabled" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+ let!(:invited_admin) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited Admin",
+ email: "invited_admin@example.org",
+ admin: true
+ },
+ inviter
+ )
+ end
+ end
+
+ before do
+ allow(Decidim.config).to receive(:admin_password_strong).and_return(false)
+ end
+
+ it "displays regular password requirements for admins" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+ end
+
+ context "with invalid invitation token" do
+ it "shows error for invalid token" do
+ visit "/users/invitation/accept?invitation_token=invalid_token"
+
+ expect(page).to have_content("The invitation token provided is not valid")
+ end
end
end
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index efabd2af563e4..28167accf7538 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -61,6 +61,25 @@
expect(page).to have_content("There is an error in this field.")
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization.name["ca"])
+
+ within "#organization-name-tabs" do
+ click_on "English"
+ end
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
context "when there are more than 4 locales in the organization" do
let(:available_locales) { %w(en ca es fr it) }
let(:organization_names) do
@@ -93,6 +112,23 @@
load "#{Decidim::Admin::Engine.root}/app/forms/decidim/admin/organization_form.rb"
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization_names[:ca])
+
+ select "English", from: "organization-name-tabs"
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
it "renders a dropdown for the language selector and switches between languages" do
visit decidim_admin.edit_organization_path
diff --git a/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
new file mode 100644
index 0000000000000..1fd1b638639d4
--- /dev/null
+++ b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin publishes/unpublishes content blocks" do
+ let(:organization) { create(:organization) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ end
+
+ context "when publishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+ it "shows published content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-available" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).not_to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_css("[id^=hero]")
+ end
+ end
+
+ context "when unpublishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+ let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+ it "does not show unpublished content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-actives" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_no_css("[id^=hero]")
+ end
+ end
+end
diff --git a/decidim-admin/spec/system/member_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
index 8be1fb11dfe3f..8e38f2f22e3ed 100644
--- a/decidim-admin/spec/system/member_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -30,7 +30,7 @@
context "when there are existing users" do
before do
- create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
+ create_list(:assembly_member, 3, participatory_space: assembly, organization: assembly.organization)
visit current_path
end
diff --git a/decidim-admin/spec/system/member_spec.rb b/decidim-admin/spec/system/member_spec.rb
index 2afe0b3eec5e7..06f6053943b7c 100644
--- a/decidim-admin/spec/system/member_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -8,7 +8,7 @@
let!(:user) { create(:user, :admin, :confirmed, organization:) }
let(:assembly) { create(:assembly, organization:, has_members: true) }
- let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
+ let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, organization: assembly.organization) }
before do
switch_to_host(organization.host)
diff --git a/decidim-ai/lib/decidim/ai.rb b/decidim-ai/lib/decidim/ai.rb
index 87aaf1f9d8653..18ef28036508a 100644
--- a/decidim-ai/lib/decidim/ai.rb
+++ b/decidim-ai/lib/decidim/ai.rb
@@ -7,7 +7,5 @@ module Ai
autoload :StrategyRegistry, "decidim/ai/strategy_registry"
autoload :SpamDetection, "decidim/ai/spam_detection/spam_detection"
autoload :Language, "decidim/ai/language/language"
-
- include ActiveSupport::Configurable
end
end
diff --git a/decidim-ai/lib/decidim/ai/engine.rb b/decidim-ai/lib/decidim/ai/engine.rb
index 81c0cff9a4eb7..02dcec0a4ccd0 100644
--- a/decidim-ai/lib/decidim/ai/engine.rb
+++ b/decidim-ai/lib/decidim/ai/engine.rb
@@ -117,18 +117,6 @@ class Engine < ::Rails::Engine
.perform_later(data[:resource],
data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
end
- ActiveSupport::Notifications.subscribe("decidim.proposals.create_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
- ActiveSupport::Notifications.subscribe("decidim.proposals.update_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
end
end
diff --git a/decidim-ai/lib/decidim/ai/language/language.rb b/decidim-ai/lib/decidim/ai/language/language.rb
index 6e74db26f4348..d72d165ab4236 100644
--- a/decidim-ai/lib/decidim/ai/language/language.rb
+++ b/decidim-ai/lib/decidim/ai/language/language.rb
@@ -4,7 +4,14 @@ module Decidim
module Ai
module Language
autoload :Formatter, "decidim/ai/language/formatter"
- include ActiveSupport::Configurable
+
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
# Text cleanup service
#
@@ -15,9 +22,7 @@ module Language
# # your code
# end
# end
- config_accessor :formatter do
- Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
- end
+ mattr_accessor :formatter, default: Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
end
end
end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb b/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
deleted file mode 100644
index 7a9f044de545f..0000000000000
--- a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Ai
- module SpamDetection
- module Resource
- class CollaborativeDraft < Base
- def fields = [:body, :title]
-
- protected
-
- def query = Decidim::Proposals::CollaborativeDraft.includes(:moderation)
- end
- end
- end
- end
-end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
index 61bcb72c7a0ec..80d691ce1076d 100644
--- a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
+++ b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
@@ -3,8 +3,6 @@
module Decidim
module Ai
module SpamDetection
- include ActiveSupport::Configurable
-
autoload :Service, "decidim/ai/spam_detection/service"
module Resource
@@ -13,7 +11,6 @@ module Resource
autoload :Debate, "decidim/ai/spam_detection/resource/debate"
autoload :Initiative, "decidim/ai/spam_detection/resource/initiative"
autoload :Proposal, "decidim/ai/spam_detection/resource/proposal"
- autoload :CollaborativeDraft, "decidim/ai/spam_detection/resource/collaborative_draft"
autoload :Meeting, "decidim/ai/spam_detection/resource/meeting"
autoload :UserBaseEntity, "decidim/ai/spam_detection/resource/user_base_entity"
end
@@ -28,31 +25,31 @@ module Strategy
autoload :Bayes, "decidim/ai/spam_detection/strategy/bayes"
end
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
+
# When the engine is consistently marking spam content without errors,
# you can skip human intervention by enabling this functionality
- config_accessor :hide_reported_resources_automatically do
- Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
- end
+ mattr_accessor :hide_reported_resources_automatically, default: Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
# This is the email address used by the spam engine to
# properly identify the user that will report users and content
- config_accessor :reporting_user_email do
- Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
- end
+ mattr_accessor :reporting_user_email, default: Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :resource_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :resource_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
# You can configure the spam delay for the spam detection service.
# The default value is 30 seconds
- config_accessor :spam_detection_delay do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
- end
+ mattr_accessor :spam_detection_delay, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -71,49 +68,41 @@ module Strategy
# }
# }
# }
- config_accessor :resource_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
- }
+ mattr_accessor :resource_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method. or even define own resource visibility criteria.
# This is the place where new resources can be registered following the pattern
# Resource => Handler
- config_accessor :resource_models do
- @models ||= begin
- models = {}
- models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
- models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
- models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
- models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
- models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
- models["Decidim::Proposals::CollaborativeDraft"] = "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" if Decidim.module_installed?("proposals")
- models
- end
+ mattr_accessor :resource_models
+ self.resource_models ||= begin
+ models = {}
+ models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
+ models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
+ models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
+ models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
+ models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
+ models
end
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :resource_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :resource_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :user_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :user_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -132,32 +121,24 @@ module Strategy
# }
# }
# }
- config_accessor :user_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
- }
+ mattr_accessor :user_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method or what a hidden user really is.
- config_accessor :user_models do
- {
- "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity"
- }
- end
+ mattr_accessor :user_models, default: { "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity" }
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :user_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :user_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# this is the generic resource classifier class. If you need to change your own class, please change the
# configuration of `Decidim::Ai::SpamDetection.detection_service` variable.
diff --git a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
deleted file mode 100644
index 247dd8953c591..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User creates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) { Decidim::Proposals::CreateCollaborativeDraft.new(form, author) }
-
- include_examples "Collaborative draft spam analysis"
-end
diff --git a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
deleted file mode 100644
index 563b125e174ee..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User updates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) do
- Decidim::Proposals::UpdateCollaborativeDraft.new(form, author, collaborative_draft)
- end
-
- include_examples "Collaborative draft spam analysis" do
- let!(:collaborative_draft) do
- create(:collaborative_draft,
- component:,
- users: [author],
- title: "Some draft that is not blocked",
- body: "The body for the proposal.")
- end
- end
-end
diff --git a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
index 0cb1ddaf4fd1a..9b2eab63a0d89 100644
--- a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
+++ b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
@@ -103,18 +103,6 @@
include_examples "some resources are being spam"
end
- context "when trained model is Decidim::Proposals::CollaborativeDraft" do
- let(:manifest_name) { "proposals" }
- let(:training) { 8 }
-
- let!(:reportable) { create(:collaborative_draft, component:, users: [author], title: "Hidden resource") }
- let!(:resources) { create_list(:collaborative_draft, 3, component:, users: [author]) }
- let(:resource_models) { { "Decidim::Proposals::CollaborativeDraft" => "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" } }
-
- include_examples "resource is being indexed"
- include_examples "some resources are being spam"
- end
-
context "when trained model is Decidim::Debates::Debate" do
let(:manifest_name) { "debates" }
let(:training) { 8 }
diff --git a/decidim-ai/spec/shared/events_examples.rb b/decidim-ai/spec/shared/events_examples.rb
index 6cdfc2df6d30b..c90dd5d4fc5da 100644
--- a/decidim-ai/spec/shared/events_examples.rb
+++ b/decidim-ai/spec/shared/events_examples.rb
@@ -172,7 +172,7 @@
context "when regular content is added" do
let(:description) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -200,7 +200,7 @@
context "when regular content is added" do
let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -210,31 +210,3 @@
end
end
end
-
-shared_examples "Collaborative draft spam analysis" do
- context "when spam content is added" do
- let(:body) { "Claim your prize today so you can win." }
- let(:title) { "You are the Lucky winner" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 1 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-
- context "when regular content is added" do
- let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 0 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-end
diff --git a/decidim-api/app/controllers/decidim/api/sessions_controller.rb b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
index 97011840cf0bd..6299128062f1c 100644
--- a/decidim-api/app/controllers/decidim/api/sessions_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
@@ -45,7 +45,7 @@ def respond_with(resource, _opts = {})
render json: serialized_user.merge("avatar" => nil)
end
- def respond_to_on_destroy
+ def respond_to_on_destroy(*)
head :ok
end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 479b5af792aa2..3adeff8e3035b 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
end
s.add_dependency "decidim-core", version
- s.add_dependency "devise-jwt", "~> 0.12.1"
+ s.add_dependency "devise-jwt", ">= 0.12.1", "< 0.14.0"
s.add_dependency "graphql", ">= 2.4.17", "< 2.6"
- s.add_dependency "graphql-docs", "~> 5.0"
- s.add_dependency "rack-cors", "~> 1.0"
+ s.add_dependency "graphql-docs", ">= 5", "< 7"
+ s.add_dependency "rack-cors", ">= 1", "< 4"
s.add_development_dependency "decidim-assemblies", version
s.add_development_dependency "decidim-comments", version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 11f9beec80ec2..632f18eb5e53e 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -11,54 +11,44 @@ module Decidim
# This module holds all business logic related to exposing a Public API for
# decidim.
module Api
- include ActiveSupport::Configurable
+ class << self
+ def config = self
- # defines the schema max_per_page to configure GraphQL pagination
- config_accessor :schema_max_per_page do
- Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+ def configure
+ yield self
+ end
end
+ # defines the schema max_per_page to configure GraphQL pagination
+ mattr_accessor :schema_max_per_page, default: Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+
# defines the schema max_complexity to configure GraphQL query complexity
- config_accessor :schema_max_complexity do
- Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
- end
+ mattr_accessor :schema_max_complexity, default: Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
# defines how many aliases are permitted in a query
- config_accessor :max_aliases do
- Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
- end
+ mattr_accessor :max_aliases, default: Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
# defines the schema max_depth to configure GraphQL query max_depth
- config_accessor :schema_max_depth do
- Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- end
+ mattr_accessor :schema_max_depth, default: Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- config_accessor :disclose_system_version do
- Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
- end
+ mattr_accessor :disclose_system_version, default: Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
# makes the API authentication necessary in order to access it
# access it.
- config_accessor :force_api_authentication do
- Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
- end
+ mattr_accessor :force_api_authentication, default: Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
# allows anonymous introspection queries
# If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
# Otherwise, anyone can access it, causing security issues.
- config_accessor :enable_anonymous_introspection do
- Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
- end
+ mattr_accessor :enable_anonymous_introspection, default: Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
# The expiration time of the JWT tokens, after which issued token will
# expire. Recommended to match the value of
# `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
- config_accessor :jwt_expires_in do
- Decidim::Env.new(
- "DECIDIM_API_JWT_EXPIRES_IN",
- Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
- ).to_i
- end
+ mattr_accessor :jwt_expires_in, default: Decidim::Env.new(
+ "DECIDIM_API_JWT_EXPIRES_IN",
+ Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
+ ).to_i
# This declares all the types an interface or union can resolve to. This needs
# to be done in order to be able to have them found. This is a shortcoming of
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index 8a45ea3178273..af78fe6474a65 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when creating a new assembly
# in the system.
class CreateAssembly < Decidim::Commands::CreateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
:promoted, :taxonomizations, :parent, :organization,
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 3042adeeded07..901f911460d51 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -63,7 +63,7 @@ def duplicate_assembly
end
def duplicate_assembly_attachments
- [:hero_image, :banner_image].each do |attribute|
+ [:hero_image].each do |attribute|
next unless @assembly.attached_uploader(attribute).attached?
@duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index e91d4df267451..5747fa541ca5e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when updating a new assembly
# in the system.
class UpdateAssembly < Decidim::Commands::UpdateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
:taxonomizations, :parent, :private_space, :developer_group, :local_area,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
index 0c0d4f6753e0d..9bafd2fcb00b2 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -37,7 +37,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
@@ -63,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
- render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+ render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
index e5e6fcf6d2299..012fa88b7f97a 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
@@ -25,7 +25,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index f453269c3876e..d6b4bcc7cc644 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
index 31b07defed14e..afb1fd8012218 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
@@ -19,6 +19,7 @@ module AssemblyAdmin
included do
include Decidim::Admin::ParticipatorySpaceAdminContext
+
helper_method :current_assembly
add_breadcrumb_item_from_menu :admin_assembly_menu
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 5ab89729e7c4a..cbbfd81cf55d5 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -54,9 +54,7 @@ class AssemblyForm < Form
attribute :duration, Decidim::Attributes::LocalizedDate
attribute :included_at, Decidim::Attributes::LocalizedDate
- attribute :banner_image
attribute :hero_image
- attribute :remove_banner_image, Boolean, default: false
attribute :remove_hero_image, Boolean, default: false
validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,7 +67,6 @@ class AssemblyForm < Form
validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
validates :title, :subtitle, :description, :short_description, translatable_presence: true
- validates :banner_image, passthru: { to: Decidim::Assembly }
validates :hero_image, passthru: { to: Decidim::Assembly }
validates :weight, presence: true
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 208cc845bae6b..eaacc4dec64a8 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -71,9 +71,6 @@ class Assembly < ApplicationRecord
has_one_attached :hero_image
validates_upload :hero_image, uploader: Decidim::HeroImageUploader
- has_one_attached :banner_image
- validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
validates :slug, uniqueness: { scope: :organization }
validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 0629e11cc3264..dded25d18a7ea 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
-
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
-
-
-
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
index 8ef195373f662..2dd8a49aa4c97 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
@@ -50,10 +50,6 @@ export default class extends Controller {
if (isTransparentCheckbox) {
isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-
- if (isTransparentCheckbox.checked) {
- isTransparentCheckbox.checked = false;
- }
}
if (specialFeatures) {
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
index 024b0b10455f1..ed8f5f43512c5 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
@@ -9,10 +9,6 @@ def hero_image_url
assembly.attached_uploader(:hero_image).url
end
- def banner_image_url
- assembly.attached_uploader(:banner_image).url
- end
-
def area_name
return if assembly.area.blank?
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 35be379dc5886..8779856149558 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -42,7 +42,7 @@ def query
def assemblies_user_admins
Decidim::User.where(
id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
- .select(:decidim_user_id)
+ .select(:decidim_user_id)
)
end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index b0b825f029a1f..28900d7a89b9c 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -60,8 +60,6 @@ def import(attributes, _user, opts)
meta_scope: attributes["meta_scope"]
)
import_hero_image(attributes["remote_hero_image_url"])
- import_banner_image(attributes["remote_banner_image_url"])
-
@imported_assembly.save!
@imported_assembly
end
@@ -84,27 +82,24 @@ def import_folders_and_attachments(attachments)
next
end
- begin
- file_tmp = URI.parse(url).open
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t(
- "decidim.assemblies.admin.imports.attachment_error",
- title: attachment_title(file),
- error: format_error(e)
- )
- next
- end
-
Decidim.traceability.perform_action!("create", Attachment, @user) do
attachment = Attachment.new(
title: file["title"],
description: file["description"],
- content_type: file_tmp.content_type,
attached_to: @imported_assembly,
- weight: file["weight"],
- file: file_tmp, # Define attached_to before this
- file_size: file_tmp.size
+ weight: file["weight"]
)
+ begin
+ attachment.attached_uploader(:file).remote_url = url
+ attachment.set_content_type_and_size
+ rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+ @warnings << I18n.t(
+ "decidim.assemblies.admin.imports.attachment_error",
+ title: attachment_title(file),
+ error: format_error(e)
+ )
+ next
+ end
attachment.create_attachment_collection(file["attachment_collection"])
attachment.save!
attachment
@@ -180,14 +175,6 @@ def import_hero_image(url)
@warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
end
- def import_banner_image(url)
- return if url.blank?
-
- @imported_assembly.attached_uploader(:banner_image).remote_url = url
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
- end
-
def format_error(error)
return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
index a6dcfb2f4c0f5..4a5b77bb6aad2 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
@@ -12,7 +12,6 @@ def serialize
url: EngineRouter.main_proxy(resource).assembly_url(resource),
subtitle: resource.subtitle,
remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
- remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
developer_group: resource.developer_group,
local_area: resource.local_area,
meta_scope: resource.meta_scope,
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 861ca7914d867..e176aa7db01cd 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -98,10 +98,6 @@
<%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
-
-
- <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
index d6ed716e4f028..41801f6c9ac24 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index faa12dc4037a2..f8aa07760af84 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if parent_assembly && parent_assembly.self_and_ancestors.length %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
index 41626d1357ee0..1434001b85107 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
@@ -6,7 +6,7 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
);
// Dispatch the `ajax:loaded` event with the newly inserted element
-const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+var insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
var component = new window.Decidim.AdminAssembliesListComponent();
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
index f98ba34f2a9bc..097a30bc1b2f3 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
index d08339df210cd..95e2ade99b9dc 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.new.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
index 18f2eca3dc5c9..dea867b78ac4e 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index b5d593aa340de..f54582cc75785 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
index 45d96fe525a54..b271eed7173f4 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
index aad6260fb5fcd..1afef5e5df6e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :assembly_user_role %>
<%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
index 570517cea9aa0..765c729002a52 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 3fb3b7d068099..6bafa56d3e0ce 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
<% add_decidim_meta_tags(
title: translated_attribute(current_participatory_space.title),
resource: current_participatory_space) %>
@@ -11,13 +11,14 @@ edit_link(
)
%>
-<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
-
-
- <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
- <%= collection.size %>
-
-
+<% content_for :aside do %>
+
+ <%= t("members", scope: "decidim.participatory_space_members.index") %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
<%= render(collection) %>
-
-
+
+<% end %>
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 9e01c707a6196..cd68e71cb2001 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -107,11 +107,8 @@ en:
public: Public
published: Published
unpublished: Unpublished
- manage_trash:
- title: Deleted assemblies
new:
create: Create
- title: New assembly
update:
error: There was a problem updating this assembly.
success: Assembly successfully updated.
@@ -123,7 +120,6 @@ en:
new:
duplicate: Duplicate
select: Select which data you would like to duplicate
- title: Duplicate assembly
assembly_imports:
create:
error: There was a problem importing this assembly.
@@ -131,7 +127,6 @@ en:
new:
import: Import
select: Select which data you would like to import
- title: Import assembly
assembly_publications:
create:
error: There was a problem publishing this assembly.
@@ -146,13 +141,9 @@ en:
destroy:
success: Admin successfully removed from this assembly.
edit:
- title: Update assembly admin
update: Update
- index:
- assembly_admins_title: Assembly admins
new:
create: Create
- title: New assembly admin
update:
error: There was a problem updating an admin for this assembly.
success: Admin updated successfully for this assembly.
@@ -210,8 +201,6 @@ en:
space_filter_for:
assemblies: All assemblies
titles:
- assemblies: Assemblies
- assemblies_deleted: Deleted assemblies
assemblies_types: Assemblies types
tooltips:
deleted_assemblies_info: An assembly can only be deleted if status is "Unpublished".
@@ -247,6 +236,8 @@ en:
assemblies:
admin:
assemblies:
+ edit:
+ title: About this assembly
form:
define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
duration: Duration
@@ -265,24 +256,40 @@ en:
taxonomies: Taxonomies
title: General Information
visibility: Visibility
+ index:
+ title: Assemblies
+ manage_trash:
+ title: Deleted assemblies
+ new:
+ title: New assembly
assembly_duplicates:
form:
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Duplicate assembly
assembly_imports:
form:
document_legend: Add a document
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Import assembly
assembly_members:
form:
explanation: 'Guidance for image:'
image_guide: Preferably a portrait image that does not have any text.
non_user_avatar_help: You should get the consent of the persons before publishing them as a member.
+ assembly_user_roles:
+ edit:
+ title: Update assembly admin
+ index:
+ title: Assembly admins
+ new:
+ title: New assembly admin
content_blocks:
highlighted_assemblies:
max_results: Maximum amount of elements to show
imports:
attachment_error: The attachment "%{title}" could not be imported (%{error}).
- banner_image_error: The banner image could not be imported (%{error}).
hero_image_error: The hero image could not be imported (%{error}).
new_import:
accepted_types:
@@ -311,9 +318,6 @@ en:
type: Type
show:
title: About this assembly
- assembly_members:
- index:
- members: Members
content_blocks:
children_assemblies:
name: Assemblies
@@ -355,9 +359,6 @@ en:
duration: Duration
private_space: This is a private assembly
social_networks_title: Visit assembly on
- assembly_members:
- index:
- title: Members
download_your_data:
show:
assemblies: Assemblies export
diff --git a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
index f5dbd012845c8..063ce22662adc 100644
--- a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
+++ b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
@@ -7,10 +7,10 @@ def change
# required so that test suite works in ci env
enable_extension "ltree"
rescue StandardError
- raise <<-MSG.squish
- Decidim requires the ltree extension to be enabled in your PostgreSQL.
- You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
- super user.
+ raise <<~MSG.squish
+ Decidim requires the ltree extension to be enabled in your PostgreSQL.
+ You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+ super user.
MSG
end
end
diff --git a/decidim-assemblies/lib/decidim/api/assembly_type.rb b/decidim-assemblies/lib/decidim/api/assembly_type.rb
index 1405d7e2aec10..5205f6f7cecab 100644
--- a/decidim-assemblies/lib/decidim/api/assembly_type.rb
+++ b/decidim-assemblies/lib/decidim/api/assembly_type.rb
@@ -17,7 +17,6 @@ class AssemblyType < Decidim::Api::Types::BaseObject
description "An assembly"
- field :banner_image, String, "The banner image for this assembly", null: true
field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
field :children_count, Integer, "Number of children assemblies", null: true
field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
@@ -64,10 +63,6 @@ def url
def hero_image
object.attached_uploader(:hero_image).url
end
-
- def banner_image
- object.attached_uploader(:banner_image).url
- end
end
end
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ebd08fba721d4..2f20677f1623e 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -42,13 +42,12 @@ class Engine < ::Rails::Engine
end
get "/assemblies", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies"
}
get "/assemblies/*rest", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
-
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies/#{params[:rest]}"
}
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/seeds.rb b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
index 4667312ad2f4a..4900aa839bd20 100644
--- a/decidim-assemblies/lib/decidim/assemblies/seeds.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
@@ -60,7 +60,6 @@ def create_assembly!(parent: nil)
end,
organization:,
hero_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? hero_image : nil, # Keep after organization
- banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
promoted: true,
published_at: 2.weeks.ago,
meta_scope: Decidim::Faker::Localized.word,
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index cefe5ad3d9a55..b46807b899ffc 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -27,7 +27,6 @@
description { generate_localized_description(:assembly_description, skip_injection:) }
organization
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
- banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
published_at { Time.current }
deleted_at { nil }
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index 5b175f3ee64f9..e4952a91aa401 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -18,7 +18,6 @@ module Decidim::Assemblies
end
let(:related_process_ids) { [participatory_processes.map(&:id)] }
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:taxonomizations) do
2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
end
@@ -34,7 +33,6 @@ module Decidim::Assemblies
slug: "slug",
meta_scope: { en: "meta scope" },
hero_image:,
- banner_image:,
promoted: nil,
developer_group: { en: "developer group" },
local_area: { en: "local" },
@@ -87,7 +85,6 @@ module Decidim::Assemblies
content_type: "image/jpeg"
)
end
- let(:banner_image) { hero_image }
before do
allow(Decidim::ActionLogger).to receive(:log).and_return(true)
@@ -99,7 +96,6 @@ module Decidim::Assemblies
it "adds errors to the form" do
expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
- expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
subject.call
end
end
@@ -112,14 +108,12 @@ module Decidim::Assemblies
content_type: "image/png"
)
end
- let(:banner_image) { nil }
let(:form) do
Admin::AssemblyForm.from_params(
title: { en: "title" },
subtitle: { en: "subtitle" },
slug: "slug",
hero_image:,
- banner_image:,
description: { en: "description" },
short_description: { en: "short_description" },
organization:
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..ee9b46ea875d5 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -44,10 +44,6 @@ def stub_calls_to_external_files
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 384d61f6e9732..0af3499198faa 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
2.times.map { create(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: my_assembly) }
end
let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
- let(:banner_image) { my_assembly.banner_image }
let(:params) do
{
assembly: {
@@ -69,8 +68,7 @@ module Decidim::Assemblies
end
let(:attachment_params) do
{
- hero_image: hero_image.blob,
- banner_image: banner_image.blob
+ hero_image: hero_image.blob
}
end
let(:context) do
@@ -105,7 +103,6 @@ module Decidim::Assemblies
context "when the uploaded hero image has too large dimensions" do
let(:attachment_params) do
{
- banner_image: banner_image.blob,
hero_image: ActiveStorage::Blob.create_and_upload!(
io: File.open(Decidim::Dev.asset("5000x5000.png")),
filename: "5000x5000.png",
@@ -125,7 +122,6 @@ module Decidim::Assemblies
allow(form).to receive(:invalid?).and_return(false)
expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
my_assembly.errors.add(:hero_image, "File resolution is too large")
- my_assembly.errors.add(:banner_image, "File resolution is too large")
end
it "broadcasts invalid" do
@@ -136,7 +132,6 @@ module Decidim::Assemblies
command.call
expect(form.errors[:hero_image]).not_to be_empty
- expect(form.errors[:banner_image]).not_to be_empty
end
end
@@ -176,14 +171,12 @@ module Decidim::Assemblies
expect(linked_participatory_processes).to match_array(participatory_processes)
end
- context "when homepage image is not updated" do
+ context "when hero image is not updated" do
let(:attachment_params) do
- {
- banner_image: banner_image.blob
- }
+ {}
end
- it "does not replace the homepage image" do
+ it "does not replace the hero image" do
expect(my_assembly).not_to receive(:hero_image=)
command.call
@@ -193,23 +186,6 @@ module Decidim::Assemblies
end
end
- context "when banner image is not updated" do
- let(:attachment_params) do
- {
- hero_image: hero_image.blob
- }
- end
-
- it "does not replace the banner image" do
- expect(my_assembly).not_to receive(:banner_image=)
-
- command.call
- my_assembly.reload
-
- expect(my_assembly.banner_image).to be_present
- end
- end
-
context "when updating the parent assembly" do
let!(:parent_assembly) { create(:assembly, organization:) }
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index cb707515ee6db..6b37e015f9025 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -120,7 +120,6 @@ module Admin
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
"hero_image" => attachment,
- "banner_image" => attachment,
"slug" => slug,
"private_space" => private_space,
"has_members" => has_members,
@@ -185,7 +184,7 @@ module Admin
it { is_expected.not_to be_valid }
end
- context "when attachment (hero_image or banner_image) is too big" do
+ context "when attachment (hero_image) is too big" do
before do
organization.settings.tap do |settings|
settings.upload.maximum_file_size.default = 5
@@ -298,7 +297,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
@@ -351,7 +349,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index e4e50af28d4ad..dc43eac7cab3d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -12,26 +12,17 @@ module Decidim
describe "when no images were uploaded" do
before do
assembly.hero_image.purge
- assembly.banner_image.purge
end
it "return nil for hero_image_url" do
expect(subject.hero_image_url).to be_nil
end
-
- it "return nil for banner_image_url" do
- expect(subject.banner_image_url).to be_nil
- end
end
describe "when images are attached" do
it "resolves hero_image_url" do
expect(subject.hero_image_url).to be_blob_url(assembly.hero_image.blob)
end
-
- it "resolves banner_image_url" do
- expect(subject.banner_image_url).to be_blob_url(assembly.banner_image.blob)
- end
end
end
end
diff --git a/decidim-assemblies/spec/requests/redirect_routes_spec.rb b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
new file mode 100644
index 0000000000000..ad28fe824faf9
--- /dev/null
+++ b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Redirect routes" do
+ let(:organization) { create(:organization, available_locales: %w(en es ca), default_locale: "en") }
+ let(:headers) { { "HOST" => organization.host } }
+
+ it "redirects old url with missing locale" do
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale" do
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+
+ it "redirects to default locale when the locale is invalid" do
+ get("/assemblies?locale=esp", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale and additional params" do
+ get("/assemblies/foo-bar?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies/foo-bar")
+ end
+
+ it "redirects user to the new url" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/ca/assemblies")
+ end
+
+ it "redirects user to the new url when using custom locale" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index f7c15cbab8bc3..50e7761e4d336 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -51,12 +51,10 @@ module Decidim::Assemblies
"created_by" => "citizens",
"meta_scope" => Decidim::Faker::Localized.sentence(word_count: 3),
"announcement" => Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title },
- "remote_hero_image_url" => hero_image_url,
- "remote_banner_image_url" => banner_image_url
+ "remote_hero_image_url" => hero_image_url
}
end
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly correctly" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
@@ -139,95 +137,22 @@ module Decidim::Assemblies
end
end
- context "when banner image URL is present and accessible" do
- let(:banner_image_url) { "http://example.com/banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, banner_image_url)
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
- end
-
- it "imports the assembly with the banner image" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- expect(subject.banner_image).to be_attached
- end
-
- it "has no warnings" do
- subject
- expect(importer.warnings).to be_empty
- end
- end
-
- context "when banner image URL returns 404 error" do
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "does not attach the banner image" do
- subject
- expect(subject.banner_image).not_to be_attached
- end
-
- it "collects a warning about the missing banner image" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported \(404 Not Found\)\./i))
- end
- end
-
- context "when both hero and banner images fail to import" do
- let(:hero_image_url) { "http://example.com/missing-hero.jpg" }
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, hero_image_url).to_return(status: 404)
- stub_request(:head, hero_image_url).to_return(status: 404)
- stub_request(:get, banner_image_url).to_return(status: 500)
- stub_request(:head, banner_image_url).to_return(status: 500)
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "collects warnings for both images" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The hero image could not be imported/i))
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported/i))
- expect(importer.warnings.length).to eq(2)
- end
- end
-
context "when image URL is nil" do
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
context "when image URL is empty string" do
let(:hero_image_url) { "" }
- let(:banner_image_url) { "" }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
@@ -311,6 +236,114 @@ module Decidim::Assemblies
expect(importer.warnings).to include(a_string_matching(/The attachment "Test File" could not be imported \(500 Internal Server Error\)\./i))
end
end
+
+ context "when remote file is accessible and downloadable (PDF)" do
+ let(:remote_file_url) { "http://example.com/document.pdf" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ expect(attachment.file.filename.to_s).to eq("document.pdf")
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("application/pdf")
+ end
+
+ it "sets the file size automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file_size).to be_present
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file is accessible and downloadable (image)" do
+ let(:remote_file_url) { "http://example.com/image.jpg" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("image/jpeg")
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file URL is blank" do
+ let(:attachments_data) do
+ {
+ "files" => [
+ {
+ "title" => { "en" => "Test File" },
+ "description" => { "en" => "Test Description" },
+ "weight" => 1,
+ "remote_file_url" => ""
+ }
+ ],
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
+
+ context "when files array is nil" do
+ let(:attachments_data) do
+ {
+ "files" => nil,
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
end
end
end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 57ec9cb121f86..2577d2432fb03 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
index 9d07c6c3d027c..baee2322438b5 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
@@ -23,7 +23,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index c4a4409979ba0..c98bd31acad1e 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -18,7 +18,7 @@
it "updates an assembly" do
fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
- dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
+ dynamically_attach_file(:assembly_hero_image, image3_path, remove_before: true)
within ".edit_assembly" do
expect(assembly_parent_id_options).not_to include(assembly.id)
@@ -84,12 +84,6 @@
src = page.find("img")["src"]
expect(src).to be_blob_url(hero_blob)
end
-
- banner_blob = assembly.hero_image.blob
- within %([data-active-uploads] [data-filename="#{banner_blob.filename}"]) do
- src = page.find("img")["src"]
- expect(src).to be_blob_url(banner_blob)
- end
end
end
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index f365f2fb79242..8d59e9521f705 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -29,10 +29,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
@@ -115,10 +111,6 @@
.to_return(status: 404, body: "Not Found")
stub_request(:head, "http://example.com/missing-hero.jpg")
.to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
within_admin_menu do
click_on "Import"
@@ -149,115 +141,7 @@
end
end
- context "when banner image URL returns 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 banner",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-banner"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows a warning about the missing banner image" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 banner")
-
- within ".flash.warning" do
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both hero and banner image URLs return 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_hero_image_url"] = "http://example.com/missing-hero.jpg"
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 images",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-both"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows warnings for both missing images" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 images")
-
- within ".flash.warning" do
- expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both image URLs are too long and return 404" do
+ context "when hero image URL is too long and returns 404" do
let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
let(:json_file) do
Tempfile.new(["assemblies", ".json"]).tap do |file|
@@ -269,20 +153,14 @@
Rack::Test::UploadedFile.new(json_file.path, "application/json")
end
let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
- let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
before do
json_data.first["remote_hero_image_url"] = hero_image_url
- json_data.first["remote_banner_image_url"] = banner_image_url
stub_request(:get, hero_image_url)
.to_return(status: 404, body: "Not Found")
stub_request(:head, hero_image_url)
.to_return(status: 404, body: "Not Found")
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
within_admin_menu do
click_on "Import"
@@ -303,13 +181,12 @@
click_on "Import"
end
- it "imports successfully and shows warnings for both missing images" do
+ it "imports successfully and shows warnings for missing hero image" do
expect(page).to have_callout("Assembly successfully imported.")
expect(page).to have_callout("Import assembly with long 404 images")
within ".flash.warning" do
expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
end
end
end
@@ -338,10 +215,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
within_admin_menu do
click_on "Import"
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 9e945e03285ca..e23ed6837013a 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -86,7 +86,6 @@
end
dynamically_attach_file(:assembly_hero_image, image1_path)
- dynamically_attach_file(:assembly_banner_image, image2_path)
within ".new_assembly" do
find("*[type=submit]").click
@@ -111,15 +110,11 @@
visit decidim_admin_assemblies.assemblies_path
end
- it "update a participatory process without images does not delete them" do
+ it "update an assembly without images does not delete them" do
within "tr", text: translated(assembly3.title) do
click_on translated(assembly3.title)
end
- within_admin_sidebar_menu do
- click_on "About this assembly"
- end
-
select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
click_on "Update"
@@ -135,6 +130,18 @@
expect(src).to be_blob_url(hero_blob)
end
end
+
+ describe "when the assembly is transparent" do
+ let!(:assembly3) { create(:assembly, :private, :transparent, organization:) }
+
+ it "shows the transparent checkbox correctly" do
+ within "tr", text: translated(assembly3.title) do
+ click_on translated(assembly3.title)
+ end
+
+ expect(page).to have_checked_field("assembly_is_transparent")
+ end
+ end
end
context "when managing parent assemblies" do
@@ -195,4 +202,61 @@
end
end
end
+
+ context "when navigating grandchild assemblies (3rd level)" do
+ let!(:grandmother_assembly) { create(:assembly, organization:) }
+ let!(:mother_assembly) { create(:assembly, organization:, parent: grandmother_assembly) }
+ let!(:child_assembly) { create(:assembly, :with_content_blocks, organization:, parent: mother_assembly) }
+ let(:assembly) { child_assembly }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ visit decidim_admin_assemblies.assemblies_path
+ end
+
+ describe "listing grandchild assemblies" do
+ it "expands both parent and grandparent assemblies to show child" do
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(child_assembly.title))
+
+ # Opens actions dropdown in child
+ find("button[data-target='actions-assembly-#{child_assembly.id}']").click
+ expect(page).to have_content("Edit")
+ expect(page).to have_content("Share link")
+ expect(page).to have_content("Export")
+
+ # Collapse mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(child_assembly.title))
+ expect(page).to have_content(translated(mother_assembly.title))
+
+ # Collapse grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+ end
+ end
+ end
end
diff --git a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
index a52d4aaefbcf5..1749135152554 100644
--- a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
@@ -5,12 +5,11 @@
describe "Social shares" do
let(:organization) { create(:organization) }
- let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:, banner_image:) }
+ let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:) }
let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
let!(:attachment) { create(:attachment, :with_image, attached_to: assembly, file: attachment_file) }
let(:description) { { en: "Description
" } }
let(:short_description) { { en: "Description
" } }
- let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
@@ -44,19 +43,11 @@
context "when no hero_image" do
let(:hero_image) { nil }
- it_behaves_like "a social share meta tag", "city.jpeg"
- end
-
- context "when no direct images" do
- let(:hero_image) { nil }
- let(:banner_image) { nil }
-
it_behaves_like "a social share meta tag", "city3.jpeg"
end
context "when no attachments nor direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
it_behaves_like "a social share meta tag", "description_image.jpg"
@@ -70,7 +61,6 @@
context "when no attachments, description image or direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
@@ -80,7 +70,6 @@
context "when nothing" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index a59648ec90844..c197eb01dd68c 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -83,14 +83,6 @@ module Assemblies
end
end
- describe "bannerImage" do
- let(:query) { "{ bannerImage }" }
-
- it "returns the banner image field" do
- expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
- end
- end
-
describe "promoted" do
let(:query) { "{ promoted }" }
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 506a9bf3b697c..fdedb5a24c0fb 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -77,7 +77,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -200,7 +199,6 @@
it "returns the correct response" do
data = response["assemblies"].first
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
@@ -231,7 +229,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -344,7 +341,6 @@
it "returns the correct response" do
data = response["assembly"]
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index dea863457fd7f..0af90d0f23945 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -26,7 +26,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +48,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index aeffda5c91004..3a7aecce62871 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -36,7 +36,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -58,7 +58,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
@@ -97,11 +97,8 @@ def posts
end
end
- # PROVISIONAL if we implement counter cache
def posts_most_commented
- @posts_most_commented ||= posts.joins(:comments).group(:id)
- .select("count(decidim_comments_comments.id) as counter")
- .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
+ @posts_most_commented ||= posts.order(comments_count: :desc).published_at_desc.limit(7)
end
def add_breadcrumb_item
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 38c74550bb540..c1c1801729431 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -38,7 +38,7 @@ class Post < Blogs::ApplicationRecord
D: :body,
datetime: :created_at
},
- index_on_create: true,
+ index_on_create: ->(post) { post.visible? },
index_on_update: ->(post) { post.visible? })
class << self
diff --git a/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
new file mode 100644
index 0000000000000..322bc8361847d
--- /dev/null
+++ b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages component publication" do
+ include_context "when managing a component as an admin" do
+ let!(:resource) { create(:post, :published, component:) }
+
+ context "when cycling through publication states" do
+ let!(:component) { create(:post_component, participatory_space:) }
+
+ include_examples "cycling through publication states"
+ end
+
+ context "when component is unpublished, and admin publishes" do
+ let!(:component) { create(:post_component, :unpublished, participatory_space:) }
+
+ include_examples "add component resources to search index"
+ end
+
+ context "when component is published, and admin unpublishes" do
+ let!(:component) { create(:post_component, :published, participatory_space:) }
+
+ include_examples "removes component resources from search index"
+ end
+ end
+end
diff --git a/decidim-blogs/spec/system/admin_publishes_component_spec.rb b/decidim-blogs/spec/system/admin_publishes_component_spec.rb
deleted file mode 100644
index 734951b434d63..0000000000000
--- a/decidim-blogs/spec/system/admin_publishes_component_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin publishes component" do
- let(:manifest_name) { "blogs" }
- let!(:resource) { create(:post, component:) }
-
- include_context "when publishing and unpublishing the component"
- include_context "when cycling through publication states"
-end
diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
index e5f196d91df65..5167807fcb88a 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
@@ -35,7 +35,8 @@ def progress_budgets
end
def non_voted_budgets
- budgets.where.not(id: voted.map(&:id))
+ budgets_to_exclude = progress_budgets + voted
+ budgets.where.not(id: budgets_to_exclude.map(&:id))
end
def highlighted?
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..bd80489593723 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class CreateProject < Decidim::Commands::CreateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..522afcf3e0697 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class UpdateProject < Decidim::Commands::UpdateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
def initialize(form, project)
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
index 41dc4fcfe8b1b..a2f334d877695 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
@@ -6,6 +6,7 @@ module Admin
# This controller allows the create or update a budget.
class BudgetsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
+
helper_method :budgets, :budget, :finished_orders, :pending_orders,
:users_with_pending_orders, :users_with_finished_orders
@@ -26,7 +27,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +49,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 7eb5bd00861e6..e45f48995522a 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
include Decidim::Admin::ComponentTaxonomiesHelper
include Decidim::Budgets::Admin::Filterable
+
helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
helper Decidim::Budgets::ProjectsHelper
@@ -39,7 +40,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -62,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
index 22d03155470d7..a60f8ebcf6a9e 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
index 8b4b94a8342bb..dca3242383a8f 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
@@ -22,12 +22,12 @@ def create
AddLineItem.call(persisted_current_order, project, current_user) do
on(:ok) do |order|
self.current_order = order
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
@@ -38,12 +38,12 @@ def destroy
respond_to do |format|
RemoveLineItem.call(current_order, project) do
on(:ok) do |_order|
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 4918e044c4329..eb4b8f4425d82 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -16,7 +16,7 @@ class BudgetForm < Decidim::Form
validates :title, translatable_presence: true
validates :weight, numericality: { greater_than_or_equal_to: 0 }
- validates :total_budget, numericality: { greater_than: 0 }
+ validates :total_budget, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 339ab98e8968f..530e4099dac94 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -26,7 +26,7 @@ class ProjectForm < Decidim::Form
validates :title, translatable_presence: true
validates :description, translatable_presence: true
- validates :budget_amount, presence: true, numericality: { greater_than: 0 }
+ validates :budget_amount, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
validate :notify_missing_attachment_if_errored
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 9990eab6dddcb..e5dcb4b0015a9 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -134,14 +134,14 @@ def attachment_context
end
ransacker :confirmed_orders_count do
- query = <<-SQL.squish
- (
- SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
- FROM decidim_budgets_line_items
- LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
- WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
- AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
- )
+ query = <<~SQL.squish
+ (
+ SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+ FROM decidim_budgets_line_items
+ LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+ WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+ AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+ )
SQL
Arel.sql(query)
end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
index 70bf4c4dc4a39..b16297b1722a6 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
+<% add_decidim_page_title(t(".title", budget: decidim_sanitize_translated(budget.title))) %>
+
- <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+ <%= t(".title", budget: decidim_sanitize_translated(budget.title)) %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index ad4cef7763585..7c2f6e7f77309 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -3,7 +3,7 @@
+ <% if has_replies_in_children? %>
+ <%= render :replies %>
+ <% elsif can_reply? %>
+
+ <% end %>
<% end %>
<% if current_user.present? %>
<%= cell("decidim/report_button", model, modal_id: "flagModalComment#{model.id}").flag_modal %>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 4e0c60d16d97c..3c792e8a940b6 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -86,10 +86,6 @@ def comment_body
formatted_body
end
- def replies
- SortedComments.for(model, order_by: order)
- end
-
def order
options[:order] || "older"
end
@@ -234,7 +230,11 @@ def has_replies?
end
def has_replies_in_children?
- model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
+ replies_count.positive?
+ end
+
+ def replies_count
+ @replies_count ||= model.replies.count
end
# action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
index 9670e0ca5ee7c..78bbcedd57d47 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
@@ -31,7 +31,7 @@
<% end %>
">
- <%= t("components.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to?(:create, :component) %>
diff --git a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
index 9f57bccc47c3e..0b46cc872ac06 100644
--- a/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
+++ b/decidim-admin/app/views/decidim/admin/components/manage_trash.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("components.manage_trash.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("components.manage_trash.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
index c66b11589e51f..a1c415ffdacb2 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/edit.html.erb
@@ -1,6 +1,8 @@
+<% add_decidim_page_title(t(".title")) %>
+
- Transfer User
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
index 16117766de80e..392d6b569586b 100644
--- a/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/conflicts/index.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("title", scope: "decidim.admin.conflicts")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("title", scope: "decidim.admin.conflicts") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
index 858a3445a11e8..b3a7ec5cc863f 100644
--- a/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/dashboard/show.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("decidim.admin.titles.dashboard")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.dashboard" %> <%= current_organization_name %>
+ <%= t(".title") %> <%= current_organization_name %>
@@ -46,6 +46,6 @@
<% end %>
<% if current_user.admin_terms_accepted? %>
- <%= link_to( t("title", scope: "decidim.admin.admin_terms_of_service"), admin_terms_show_path, class: "button button__text-secondary") %>
+ <%= link_to( t("title", scope: "decidim.admin.admin_terms.show"), admin_terms_show_path, class: "button button__text-secondary") %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
deleted file mode 100644
index 77839a7a15cdf..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/password_change.html.erb
+++ /dev/null
@@ -1,3 +0,0 @@
-Hello <%= @resource.email %>!
-
-We are contacting you to notify you that your password has been changed.
diff --git a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb b/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
deleted file mode 100644
index 708edf07be4be..0000000000000
--- a/decidim-admin/app/views/decidim/admin/devise/mailers/reset_password_instructions.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-Hello <%= @resource.email %>!
-
-Someone has requested a link to change your password. You can do this through the link below.
-
-<%= link_to "Change my password", edit_password_url(@resource, reset_password_token: @token) %>
-
-If you did not request this, please ignore this email.
-Your password will not change until you access the link above and create a new one.
diff --git a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
index 6e05cc045575a..31d11247ac7d7 100644
--- a/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
+++ b/decidim-admin/app/views/decidim/admin/help_sections/update.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render partial: "form", object: @form %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
index 2fab7a6d3c532..65649997871f4 100644
--- a/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonatable_users/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("impersonatable_users", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if current_organization.available_authorizations.empty? %>
<%= cell("decidim/announcement", t(".needs_authorization_warning"), callout_class: "warning" ) %>
@@ -7,7 +8,7 @@
- <%= t "decidim.admin.titles.impersonatable_users" %>
+ <%= t ".title" %>
<% if allowed_to? :impersonate, :impersonatable_user, user: new_managed_user %>
<%= link_to t(".impersonate_new_managed_user"), new_impersonatable_user_impersonation_path(:new_managed_user), class: "button button__sm button__secondary #{"disabled" if current_organization.available_authorizations.empty?}" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
index cce55b1bec168..ebd237dbf6062 100644
--- a/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/impersonations/new.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("impersonate_new_managed_user", scope: "decidim.admin.impersonations.new")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if creating_managed_user? %>
- <%= t(".impersonate_new_managed_user") %>
+ <%= t(".title") %>
<% else %>
<% if @form.user.managed? %>
<%= t(".impersonate_existing_managed_user", name: @form.user.name) %>
diff --git a/decidim-admin/app/views/decidim/admin/imports/new.html.erb b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
index bdf151be9c30f..14a53b52b2894 100644
--- a/decidim-admin/app/views/decidim/admin/imports/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/imports/new.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(import_manifest.message(:title, self)) %>
+
<%= import_manifest.message(:title, self) %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
index cbac48cb47b9e..d85d0543b147f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/_logs_list.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.admin_log" %>
+ <%= t "decidim.admin.logs.index.title" %>
<%= render partial: "decidim/admin/logs/filters" if defined?(display_filters) && display_filters %>
diff --git a/decidim-admin/app/views/decidim/admin/logs/index.html.erb b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
index b08e5fe4f8509..7af432ec8134f 100644
--- a/decidim-admin/app/views/decidim/admin/logs/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/logs/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("admin_log", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
<%= render partial: "decidim/admin/logs/logs_list", locals: { logs:, empty_logs: no_logs_available?, display_filters: true } %>
<%= decidim_paginate logs %>
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 c1dfb56faae16..28a5487da2c1f 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
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.impersonations")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.impersonations" %>
+ <%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
index c890a31d0ec2a..8df79d3c485e8 100644
--- a/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/managed_users/promotions/new.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".new_managed_user_promotion")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t(".new_managed_user_promotion") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
index 66599d17432ae..23891cac94b7e 100644
--- a/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletter_templates/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview", template_name: t(template_manifest.public_name_key))) %>
+<% add_decidim_page_title(t(".title", template_name: t(template_manifest.public_name_key))) %>
+
- <%= t ".preview", template_name: t(template_manifest.public_name_key) %>
+ <%= t ".title", template_name: t(template_manifest.public_name_key) %>
diff --git a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
index 362cdd1ffd248..ff6c3600f26aa 100644
--- a/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/newsletters/show.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t(".preview")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t ".preview" %>
+ <%= t ".title" %>
<% if allowed_to?(:update, :newsletter, newsletter: @newsletter) %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
index a190d5bed569a..c1f179dbe0460 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/index.html.erb
@@ -1,8 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.participants")) %>
+<% add_decidim_page_title(t(".title")) %>
-
+
- <%= t "decidim.admin.titles.participants" %>
+
+ <%= t ".title" %>
+
<%= admin_filter_selector %>
diff --git a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
index 680203b3487fb..3c306de596edb 100644
--- a/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
+++ b/decidim-admin/app/views/decidim/admin/officializations/show_email.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= link_to user.email, "mailto:#{user.email}" %>
diff --git a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
index 2ea4feeda353e..dc82f699dd6a0 100644
--- a/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/organization_external_domain_allowlist/edit.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("edit_external_domains", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("title", scope: "decidim.admin.organization_external_domain_allowlist.form") %>
+ <%= t(".title") %>
diff --git a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
index c6cee2d5210a3..63ab9ef2ce1ee 100644
--- a/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/reminders/new.html.erb
@@ -1,4 +1,11 @@
-
+<% add_decidim_page_title(t(".title")) %>
+
+
+
+
+ <%= t ".title" %>
+
+
<%= decidim_form_for(@form, html: { class: "form form-defaults new_order_reminder" }, url: component_reminders_path(name: reminder_manifest.name), class: "form grid-container") do |form| %>
diff --git a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
index 4a789ab31623c..d34ec4631dddb 100644
--- a/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scope_types/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scope_types")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.scope_types" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :scope_type %>
<%= link_to t("actions.add", scope: "decidim.admin"), [:new, :scope_type], class: "button button__sm button__secondary new" %>
diff --git a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
index 7730666b48870..6e3f35dd52160 100644
--- a/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/scopes/index.html.erb
@@ -1,11 +1,11 @@
-<% add_decidim_page_title(t("decidim.admin.titles.scopes")) %>
+<% add_decidim_page_title(t(".title")) %>
<% if parent_scope %>
<%= scope_breadcrumbs(parent_scope).join(" - ").html_safe %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :create, :scope %><%= link_to t("actions.edit", scope: "decidim.admin"), edit_scope_path(parent_scope), class: "button button__sm button__secondary" if allowed_to? :edit, :scope, scope: parent_scope %>
<% else %>
- <%= t "decidim.admin.titles.scopes" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
+ <%= t ".title" %> <%= link_to t("actions.add", scope: "decidim.admin"), new_scope_path, class: "button button__sm button__secondary" if allowed_to? :create, :scope %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
index e0b5e3b720961..4e498e12c866f 100644
--- a/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/share_tokens/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", name: resource_title)) %>
+
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
index f099e67eb7fee..238768df7415a 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/_content_blocks.html.erb
@@ -1,5 +1,3 @@
-<% add_decidim_page_title(content_blocks_title) %>
-
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
index 36d0aabb9a743..e19a0d32d8ab2 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page/edit.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(content_blocks_title) %>
+
<%= render partial: "decidim/admin/shared/landing_page/content_blocks" %>
diff --git a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
index 3f330918d7615..8ce44f19debee 100644
--- a/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/shared/landing_page_content_blocks/edit.html.erb
@@ -1,4 +1,5 @@
<% add_decidim_page_title(t(content_block.public_name_key)) %>
+
<%= t content_block.public_name_key %>
diff --git a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
index 023a2d6b92fbc..bcc6f0405309c 100644
--- a/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_page_topics/index.html.erb
@@ -1,9 +1,9 @@
-<% add_decidim_page_title(t("page_topics", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("page_topics", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :attachment_collection %>
<%= link_to t("static_page_topics.new.create", scope: "decidim.admin"), [:new, :static_page_topic], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
index c44814f1a7da1..6c7faa224edd4 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/edit.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title t(".title") %>
+<% add_decidim_page_title(t(".title")) %>
+
<%= t ".title" %>
diff --git a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
index 7cc99a8881e32..6fe5a6a8eeb07 100644
--- a/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/static_pages/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("pages", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("pages", scope: "decidim.admin.titles") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :static_page %>
<%= link_to t("static_pages.new.create", scope: "decidim.admin"), [:new, :static_page], class: "button button__sm button__secondary expanded small new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
index 85b867615d752..9dbec1682d5d9 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/_statistics.html.erb
@@ -1,7 +1,7 @@
- <%= t "decidim.admin.titles.statistics" %>
+ <%= t "decidim.admin.statistics.index.title" %>
diff --git a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
index 209083c2d9cb2..c846c90b461a3 100644
--- a/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/statistics/index.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render(
partial: "decidim/admin/statistics/statistics",
locals: {
diff --git a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
index f206951a7af75..9cb6426932777 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomies/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("taxonomies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "decidim.admin.titles.taxonomies" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_taxonomy"), new_taxonomy_path, class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
index d4e0d04a5848d..fa0dd723d2d63 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters/index.html.erb
@@ -1,10 +1,10 @@
-<% add_decidim_page_title(t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name))) %>
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(root_taxonomy.name))) %>
- <%= t("decidim.admin.titles.taxonomy_filters", taxonomy: translated_attribute(root_taxonomy.name)) %>
+ <%= t(".title", taxonomy: translated_attribute(root_taxonomy.name)) %>
<% if allowed_to? :create, :taxonomy %>
<%= link_to t(".new_filter"), new_taxonomy_filter_path(root_taxonomy), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
index ec88de7a2a715..8d2fc0f61787d 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/index.html.erb
@@ -1 +1,3 @@
+<% add_decidim_page_title(t(".title")) %>
+
<%= render "decidim/admin/taxonomy_filters_selector/taxonomies_select" %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
index 07c677b1a2def..a146049a944e5 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= button_tag class: "button button__secondary button__sm", id: "save-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
index b70d48b8c69f0..389dfd7ce688e 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_filters_selector/show.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title")) %>
+
<% content_for(:action_buttons) do %>
<% if taxonomy_filter %>
<%= link_to decidim_admin.taxonomy_filters_selector_path(taxonomy_filter_id: taxonomy_filter.id, taxonomy_id: root_taxonomy.id, component_id: component.id), remote: true, method: :delete, class: "button button__transparent-secondary button__sm", id: "remove-taxonomy-filter" do %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
index 56332917d60e4..e77108030c23c 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/edit.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_item_path(taxonomy_id: taxonomy.id, id: taxonomy_item.id ), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
index b2a4c43a91f36..594d58931c768 100644
--- a/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
+++ b/decidim-admin/app/views/decidim/admin/taxonomy_items/new.html.erb
@@ -1,3 +1,5 @@
+<% add_decidim_page_title(t(".title", taxonomy: translated_attribute(taxonomy.name))) %>
+
<%= decidim_form_for(@form, url: taxonomy_items_path(taxonomy), remote: true, html: { id: "taxonomy-item-form", class: "form-defaults form new_taxonomy_" }) do |f| %>
diff --git a/decidim-admin/app/views/decidim/admin/users/index.html.erb b/decidim-admin/app/views/decidim/admin/users/index.html.erb
index 3d26b0a64acb8..3306f63c147c9 100644
--- a/decidim-admin/app/views/decidim/admin/users/index.html.erb
+++ b/decidim-admin/app/views/decidim/admin/users/index.html.erb
@@ -1,8 +1,9 @@
-<% add_decidim_page_title(t("decidim.admin.titles.users")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t "decidim.admin.titles.users" %>
+ <%= t ".title" %>
<% if allowed_to? :create, :admin_user %>
<%= link_to t("actions.user.new", scope: "decidim.admin"), [:new, :user], class: "button button__sm button__secondary" %>
<% end %>
diff --git a/decidim-admin/config/locales/en.yml b/decidim-admin/config/locales/en.yml
index 0d554d179ab7e..2375605ebb12d 100644
--- a/decidim-admin/config/locales/en.yml
+++ b/decidim-admin/config/locales/en.yml
@@ -208,6 +208,9 @@ en:
user:
new: New admin
view_deleted_components: View deleted components
+ admin_terms:
+ show:
+ title: Admin terms of service
admin_terms_of_service:
accept:
error: There was a problem while accepting the admin terms of service.
@@ -221,7 +224,6 @@ en:
alert: 'Required: Review our admin terms of service'
callout: Please take a moment to review the admin terms of service. Otherwise you will not be able to manage the platform.
cta: Review them now.
- title: Admin terms of service
area_types:
create:
error: There was a problem creating a new area type.
@@ -231,6 +233,8 @@ en:
edit:
title: Edit area type
update: Update
+ index:
+ title: Area types
new:
create: Create area type
title: New area type
@@ -248,6 +252,8 @@ en:
edit:
title: Edit area
update: Update
+ index:
+ title: Areas
new:
create: Create area
title: New area
@@ -265,7 +271,7 @@ en:
title: Edit folder
update: Update
index:
- attachment_collections_title: Attachment folders
+ title: Attachment folders
new:
create: Create
title: New folder
@@ -282,7 +288,7 @@ en:
title: Edit attachment
update: Update
index:
- attachments_title: Attachments
+ title: Attachments
new:
create: Create attachment
title: New attachment
@@ -291,6 +297,9 @@ en:
success: Attachment updated successfully.
attachments_privacy_warning:
message: Be careful when working with attachments in a private space. Any participant could share this document to others.
+ authorization_workflows:
+ index:
+ title: Verification methods
autocomplete:
no_results: No results found
search_prompt: Type at least three characters to search.
@@ -335,6 +344,7 @@ en:
name: Component name
type: Component type
visibility: Visibility
+ title: Components
manage_trash:
title: Deleted components
new:
@@ -342,7 +352,6 @@ en:
title: 'Add component: %{name}'
publish:
success: The component has been successfully published.
- title: Components
unpublish:
success: The component has been successfully unpublished.
update:
@@ -354,12 +363,14 @@ en:
unpublished: Unpublished
conflicts:
attempts: Attempts
+ edit:
+ title: Transfer User
'false': 'No'
index:
text: Search by current user email, name or nickname
+ title: Verification conflicts
managed_user_name: Managed User
solved: Solved
- title: Verification conflicts
transfer:
email: Email
error: There was a problem transferring the current participant to managed participant.
@@ -392,6 +403,7 @@ en:
title: Pending Moderations
show:
dropdown: Dropdown
+ title: Dashboard
view_more_logs: View more logs
domain_allowlist:
form:
@@ -488,6 +500,8 @@ en:
form:
save: Save
success: Help sections updated successfully.
+ update:
+ title: Help sections
impersonatable_users:
index:
filter:
@@ -503,6 +517,7 @@ en:
promote: Promote
search: Search
status: Status
+ title: Manageable participants
view_logs: View logs
impersonations:
close_session:
@@ -519,7 +534,7 @@ en:
impersonate: Impersonate
impersonate_existing_managed_user: Manage participant "%{name}"
impersonate_existing_user: Manage participant "%{name}"
- impersonate_new_managed_user: Manage new participant
+ title: Impersonate participant
imports:
and: and
data_errors:
@@ -563,20 +578,25 @@ en:
participatory_space: Find participatory space
text: Search by user email, name or nickname
user: User
+ index:
+ title: Admin log
logs_list:
no_logs_yet: There are no logs yet.
no_matching_logs: There are no logs with the provided search filters. Try to change them and retry.
manage_trash:
deleted_items_warning: You are currently viewing deleted items. To make any edits or changes, you must first restore them.
managed_users:
+ impersonation_logs:
+ index:
+ title: Impersonations
promotion:
error: There was a problem promoting the managed participant.
success: The managed participant has been successfully promoted.
promotions:
new:
explanation: Managed participants can be promoted to standard participants. It means they will be invited to the application and you will not be able to manage them again. The invited participant will receive an email to accept your invitation.
- new_managed_user_promotion: New managed participant promotion
promote: Promote
+ title: New managed participant promotion
members:
create:
error: There was a problem adding a member for this participatory space.
@@ -805,7 +825,7 @@ en:
title: Newsletter templates
use_template: Use this template
show:
- preview: 'Preview template: %{template_name}'
+ title: 'Preview template: %{template_name}'
use_template: Use this template
newsletters:
confirm_recipients:
@@ -870,10 +890,10 @@ en:
send_to_user:
sent_successfully: Newsletter has been sent successfully to %{email}
show:
- preview: Preview
select_recipients_to_deliver: Select recipients to deliver
send_me_a_test_email: Send me a test email
subject: Subject
+ title: Preview
update:
error: There was a problem updating this newsletter.
success: Newsletter updated successfully. Please review it before sending.
@@ -907,12 +927,15 @@ en:
send_message: Send message
show_email: Show email
status: Status
+ title: Participants
unblock: Unblock
unofficialize: Unofficialize
new:
badge: Officialization badge
officialize: Officialize
title: Officialize participant "%{name}"
+ show_email:
+ title: Show email
show_email_modal:
description: If you need to contact a participant directly, you can click on the Show button to see their email address. This action will be logged.
email_address: Email address
@@ -957,6 +980,7 @@ en:
success: Organization updated successfully.
organization_external_domain_allowlist:
edit:
+ title: Allowed list of external domains
update: Update
external_domain:
down: Down
@@ -965,7 +989,6 @@ en:
up: Up
form:
add: Add to allowed list
- title: Allowed list of external domains
reminders:
create:
error: There was a problem creating reminders.
@@ -974,6 +997,7 @@ en:
other: "%{count} users will be reminded."
new:
submit: Send
+ title: Send reminders
resource_permissions:
edit:
submit: Submit
@@ -991,6 +1015,8 @@ en:
edit:
title: Edit scope type
update: Update
+ index:
+ title: Scope types
new:
create: Create scope type
title: New scope type
@@ -1007,6 +1033,8 @@ en:
edit:
title: Edit scope
update: Update
+ index:
+ title: Scopes
new:
create: Create scope
title: New scope
@@ -1079,6 +1107,8 @@ en:
edit:
title: Edit topic
update: Update topic
+ index:
+ title: Topics
new:
create: New topic
title: New topic
@@ -1103,6 +1133,7 @@ en:
slug_help_html: 'Use partial paths, not full URLs here. Accepts letters, numbers, dashes and slashes, and must start with a letter. Example: %{url}'
index:
last_notable_change: Last notable change
+ title: Pages
new:
create: New page
title: New page
@@ -1112,6 +1143,9 @@ en:
update:
error: There was a problem updating this page.
success: Page updated successfully.
+ statistics:
+ index:
+ title: Statistics
taxonomies:
actions:
actions: Actions
@@ -1142,6 +1176,7 @@ en:
description: Taxonomies and filters allow administrators to sort and organize content. For example, add a taxonomy with the city's districts and neighborhoods and then create filters only with the districts or for a specific neighborhood.
new_taxonomy: New taxonomy
no_items_found: No taxonomies found matching the search criteria.
+ title: Taxonomies
name: Name
new:
create: Create taxonomy
@@ -1186,6 +1221,7 @@ en:
description: A taxonomy filter allows admins to sort and filter participatory spaces based on a taxonomy. For example, add a taxonomy filter to sort processes by geographical scope.
empty: There are currently no taxonomy filters. Create a list of taxonomy filters here to sort and filter participatory spaces based on a taxonomy.
new_filter: New filter
+ title: Taxonomy filters for "%{taxonomy}"
new:
back: Back
create: Create taxonomy filter
@@ -1202,13 +1238,17 @@ en:
error: There was a problem updating this taxonomy filter.
success: Taxonomy filter updated successfully.
taxonomy_filters_selector:
+ index:
+ title: Taxonomy filters
new:
add_new_items_html: If you need to set a new filter or item, do it through the configuration settings or by clicking here.
items_count: "%{count} items"
save: Save
+ title: New taxonomy filter selector
show:
items_count: "%{count} items"
remove: Remove
+ title: Taxonomy filter selector
taxonomies_select:
filters: Filters
select_filter: Select a filter
@@ -1223,25 +1263,12 @@ en:
none: None
title: New item in %{taxonomy}
titles:
- admin_log: Admin log
- area_types: Area types
areas: Areas
authorization_workflows: Verification methods
- dashboard: Dashboard
- edit_external_domains: Allowed list of external domains
- impersonatable_users: Manageable participants
- impersonations: Participants management
menu: Menu
- page_topics: Topics
- pages: Pages
panel: Admin
- participants: Participants
- scope_types: Scope types
scopes: Scopes
statistics: Statistics
- taxonomies: Taxonomies
- taxonomy_filters: Taxonomy filters for "%{taxonomy}"
- users: Administrators
tooltips:
cannot_destroy_taxonomy_filter: Cannot destroy this taxonomy filter
cannot_edit_taxonomy_filter: Cannot edit this taxonomy filter
@@ -1265,6 +1292,8 @@ en:
email: Email
name: Name
role: Role
+ index:
+ title: Administrators
new:
create: Invite
title: Invite new administrator
@@ -1276,6 +1305,10 @@ en:
last_week: Last week
no_users_count_statistics_yet: There are no participant count statistics yet.
participants: Participants
+ components:
+ settings:
+ global:
+ taxonomy_filters_unavailable: Selecting taxonomy filters will be possible after the component is created.
forms:
errors:
impersonate_user:
diff --git a/decidim-admin/decidim-admin.gemspec b/decidim-admin/decidim-admin.gemspec
index 2c6b77e359875..57a26599c651e 100644
--- a/decidim-admin/decidim-admin.gemspec
+++ b/decidim-admin/decidim-admin.gemspec
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "active_link_to", "~> 1.0"
s.add_dependency "decidim-core", version
- s.add_dependency "devise", "~> 4.7"
+ s.add_dependency "devise", ">= 4.7", "< 6.0"
s.add_dependency "devise-i18n", "~> 1.2"
s.add_dependency "devise_invitable", "~> 2.0", ">= 2.0.9"
diff --git a/decidim-admin/lib/decidim/admin.rb b/decidim-admin/lib/decidim/admin.rb
index a7778ccba621b..652672dbd120a 100644
--- a/decidim-admin/lib/decidim/admin.rb
+++ b/decidim-admin/lib/decidim/admin.rb
@@ -15,8 +15,6 @@ module Admin
autoload :Import, "decidim/admin/import"
autoload :CustomImport, "decidim/admin/custom_import"
- include ActiveSupport::Configurable
-
# Public: Stores an instance of ViewHooks
def self.view_hooks
@view_hooks ||= ViewHooks.new
diff --git a/decidim-admin/lib/decidim/admin/menu.rb b/decidim-admin/lib/decidim/admin/menu.rb
index 0f92edad7f53c..011d5c7f77ccc 100644
--- a/decidim-admin/lib/decidim/admin/menu.rb
+++ b/decidim-admin/lib/decidim/admin/menu.rb
@@ -48,7 +48,7 @@ def self.register_workflows_menu!
def self.register_impersonate_menu!
Decidim.menu :impersonate_menu do |menu|
menu.add_item :conflicts,
- I18n.t("title", scope: "decidim.admin.conflicts"),
+ I18n.t("title", scope: "decidim.admin.conflicts.index"),
decidim_admin.conflicts_path,
active: is_active_link?(decidim_admin.conflicts_path),
if: allowed_to?(:index, :impersonatable_user)
diff --git a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
index 67e0ec58d1624..adbb0a5cc694b 100644
--- a/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
+++ b/decidim-admin/lib/decidim/admin/test/manage_hide_content_examples.rb
@@ -53,6 +53,7 @@
fill_in :block_user_justification, with: "This user is a spammer" * 2 # to have at least 15 chars
click_on I18n.t("decidim.admin.block_user.new.action")
+ expect(page).to have_content(I18n.t("decidim.admin.officializations.block.success"))
expect(content.reload).to be_hidden
diff --git a/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
new file mode 100644
index 0000000000000..dc937e285ad5c
--- /dev/null
+++ b/decidim-admin/spec/cells/decidim/admin/homepage_content_block_cell_spec.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Decidim::Admin::HomepageContentBlockCell, type: :cell do
+ controller Decidim::Admin::OrganizationHomepageController
+
+ subject { cell("decidim/admin/homepage_content_block", content_block).call }
+
+ let(:organization) { create(:organization) }
+ let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "renders the content block name" do
+ expect(subject).to have_content("Hero image")
+ end
+
+ it "renders a link to edit the content block" do
+ expect(subject).to have_link(href: /edit/)
+ end
+
+ it "renders a link to destroy the content block" do
+ expect(subject).to have_css('a[data-method="delete"][href*="/content_blocks/"]')
+ end
+
+ it "renders the drag handle" do
+ expect(subject).to have_css("[draggable=\"true\"]")
+ end
+
+ context "when content block is not persisted" do
+ let(:content_block) { build(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
+
+ it "does not render edit or destroy links" do
+ expect(subject).to have_no_link(href: %r{/content_blocks/\d+/edit$})
+ expect(subject).to have_no_css('a[data-method="delete"]')
+ end
+ end
+
+ context "when content block has no settings" do
+ let(:content_block) do
+ create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage)
+ end
+
+ it "does not render edit link" do
+ expect(subject).to have_no_link(href: /edit/)
+ end
+ end
+end
diff --git a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
index 1ca15f31bb0c5..903dc8d24465c 100644
--- a/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
+++ b/decidim-admin/spec/commands/decidim/admin/participatory_space/create_member_spec.rb
@@ -45,6 +45,19 @@ module Decidim::Admin::ParticipatorySpace
expect(members.count).to eq 1
end
+ it "creates the member only one time" do
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 0
+
+ subject.call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+
+ form = double(invalid?: false, email:, current_user:, name:, role:, published: false)
+ described_class.new(form, participatory_space, via_csv:).call
+
+ expect(Decidim::ParticipatorySpace::Member.where(user:).count).to eq 1
+ end
+
it "creates a new user with no application admin privileges" do
subject.call
expect(Decidim::User.last).not_to be_admin
diff --git a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
index 8b263c5f5a110..0d0425c9c6fff 100644
--- a/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
+++ b/decidim-admin/spec/controllers/taxonomies_controller_spec.rb
@@ -33,7 +33,7 @@ module Admin
it "breadcrumbs are set" do
get :index
- expect(controller.helpers.breadcrumb_items).to eq([label: "Taxonomies", url: taxonomies_path])
+ expect(controller.helpers.breadcrumb_items).to eq([{ label: "Taxonomies", url: taxonomies_path }])
end
end
diff --git a/decidim-admin/spec/helpers/settings_helper_spec.rb b/decidim-admin/spec/helpers/settings_helper_spec.rb
index 2010bb0ba5548..0b64b1d7fa75a 100644
--- a/decidim-admin/spec/helpers/settings_helper_spec.rb
+++ b/decidim-admin/spec/helpers/settings_helper_spec.rb
@@ -55,10 +55,23 @@ def render_input
expect(form).to receive(:select).with(
:test,
full_choices,
- options
+ options, { disabled: false }
)
render_input
end
+
+ context "when the field should be disabled" do
+ let(:options) { { include_blank: false, readonly: true, label: "A test" } }
+
+ it "is supported" do
+ expect(form).to receive(:select).with(
+ :test,
+ full_choices,
+ options.except(:readonly), { disabled: true }
+ )
+ render_input
+ end
+ end
end
describe "booleans" do
@@ -188,6 +201,18 @@ def render_input
expect(view).to receive(:render).with(partial: "decidim/admin/components/taxonomy_filters_drawer")
render_input
end
+
+ context "when component is not persisted" do
+ let(:second_component) { build(:dummy_component, participatory_space: current_participatory_space) }
+
+ before do
+ view.instance_variable_set(:@component, second_component)
+ end
+
+ it "renders a message indicating that the component is missing" do
+ expect(render_input).to include("Selecting taxonomy filters will be possible after the component is created.")
+ end
+ end
end
describe "help texts" do
diff --git a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
index a72d503bfa2e1..8d22a78dd64b5 100644
--- a/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
+++ b/decidim-admin/spec/system/admin_dashboard_count_checks_spec.rb
@@ -19,7 +19,7 @@
end
it "show Admin log panel" do
- expect(page).to have_content(t("decidim.admin.titles.admin_log"))
+ expect(page).to have_content(t("decidim.admin.logs.index.title"))
end
context "when does not have Pending moderations" do
diff --git a/decidim-admin/spec/system/admin_invite_spec.rb b/decidim-admin/spec/system/admin_invite_spec.rb
index ef869626cbdb4..ff67be3186ad4 100644
--- a/decidim-admin/spec/system/admin_invite_spec.rb
+++ b/decidim-admin/spec/system/admin_invite_spec.rb
@@ -52,5 +52,130 @@
expect(page).to have_current_path "/admin/admin_terms/show"
end
+
+ it "displays admin password requirements" do
+ visit last_email_link
+
+ expect(page).to have_content("15 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email, the organization's host")
+ expect(page).to have_content("must be different from your old passwords")
+ end
+
+ it "rejects passwords that are too short for admin" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "short123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("password is too short")
+ end
+
+ it "rejects passwords containing the user's name" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "Fiorello123456789!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("is too similar to your name")
+ end
+
+ it "rejects passwords with less than 5 unique characters" do
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "caballo_loco"
+ fill_in :invitation_user_password, with: "aaaaaaaaaaaaaaa!"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("does not have enough unique characters")
+ end
+ end
+
+ context "when inviting a regular user" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+
+ let!(:invited_user) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited User",
+ email: "invited_user@example.org"
+ },
+ inviter
+ )
+ end
+ end
+
+ it "displays regular user password requirements in help text" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must not be too common")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+
+ it "allows accepting invitation with valid user password" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ fill_in :invitation_user_nickname, with: "invited_user"
+ fill_in :invitation_user_password, with: "decidim123"
+ check :invitation_user_tos_agreement
+ click_on "Save"
+
+ expect(page).to have_content("Your password was set successfully. You are now signed in.")
+ expect(Decidim::User.find_by(email: "invited_user@example.org")).not_to be_admin
+ end
+ end
+
+ context "when admin_password_strong is disabled" do
+ let(:organization) { create(:organization, host: "new-decide.lvh.me") }
+ let(:inviter) { create(:user, :confirmed, :admin, organization:) }
+ let!(:invited_admin) do
+ perform_enqueued_jobs do
+ Decidim::User.invite!(
+ {
+ organization:,
+ name: "Invited Admin",
+ email: "invited_admin@example.org",
+ admin: true
+ },
+ inviter
+ )
+ end
+ end
+
+ before do
+ allow(Decidim.config).to receive(:admin_password_strong).and_return(false)
+ end
+
+ it "displays regular password requirements for admins" do
+ switch_to_host("new-decide.lvh.me")
+ visit last_email_link
+
+ expect(page).to have_content("10 characters minimum")
+ expect(page).to have_content("must contain at least 5 different characters")
+ expect(page).to have_content("must be different from your name, nickname, email and the organization's host")
+ expect(page).to have_no_content("must be different from your old passwords")
+ end
+ end
+
+ context "with invalid invitation token" do
+ it "shows error for invalid token" do
+ visit "/users/invitation/accept?invitation_token=invalid_token"
+
+ expect(page).to have_content("The invitation token provided is not valid")
+ end
end
end
diff --git a/decidim-admin/spec/system/admin_manages_organization_spec.rb b/decidim-admin/spec/system/admin_manages_organization_spec.rb
index efabd2af563e4..28167accf7538 100644
--- a/decidim-admin/spec/system/admin_manages_organization_spec.rb
+++ b/decidim-admin/spec/system/admin_manages_organization_spec.rb
@@ -61,6 +61,25 @@
expect(page).to have_content("There is an error in this field.")
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization.name["ca"])
+
+ within "#organization-name-tabs" do
+ click_on "English"
+ end
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
context "when there are more than 4 locales in the organization" do
let(:available_locales) { %w(en ca es fr it) }
let(:organization_names) do
@@ -93,6 +112,23 @@
load "#{Decidim::Admin::Engine.root}/app/forms/decidim/admin/organization_form.rb"
end
+ it "displays the form error for official language" do
+ visit decidim_admin.edit_organization_path(locale: :ca)
+
+ expect(page).to have_css("#organization_name_ca", visible: :visible)
+ expect(page).to have_field("organization_name_ca", with: organization_names[:ca])
+
+ select "English", from: "organization-name-tabs"
+ fill_in :organization_name_en, with: ""
+
+ click_on "Actualitzar"
+ expect(page).to have_content("S'ha produït un error en actualitzar aquesta organització.")
+
+ expect(page).to have_css("#organization_name_en", visible: :visible)
+ expect(page).to have_field("organization_name_en", with: "")
+ expect(page).to have_content("no pot estar en blanc")
+ end
+
it "renders a dropdown for the language selector and switches between languages" do
visit decidim_admin.edit_organization_path
diff --git a/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
new file mode 100644
index 0000000000000..1fd1b638639d4
--- /dev/null
+++ b/decidim-admin/spec/system/admin_publishes_unpublishes_content_blocks_spec.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin publishes/unpublishes content blocks" do
+ let(:organization) { create(:organization) }
+ let(:user) { create(:user, :admin, :confirmed, organization:) }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ end
+
+ context "when publishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: nil, published_at: nil) }
+
+ it "shows published content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-available" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-available li").drag_to(find("ul.js-list-actives"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).not_to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_css("[id^=hero]")
+ end
+ end
+
+ context "when unpublishing a content block via admin UI" do
+ let!(:hero_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage, weight: 1, published_at: Time.current) }
+ let!(:extra_block) { create(:content_block, organization:, manifest_name: :sub_hero, scope_name: :homepage, weight: 2, published_at: Time.current) }
+
+ it "does not show unpublished content block on the homepage" do
+ visit decidim_admin.edit_organization_homepage_path
+ page.refresh
+
+ within ".edit_content_blocks" do
+ within ".js-list-actives" do
+ expect(page).to have_css("li", text: "Hero image")
+ end
+
+ first("ul.js-list-actives li").drag_to(find("ul.js-list-available"))
+ sleep 2
+ end
+
+ expect(hero_block.reload.published_at).to be_nil
+
+ visit decidim.root_path
+ expect(page).to have_no_css("[id^=hero]")
+ end
+ end
+end
diff --git a/decidim-admin/spec/system/member_import_via_csv_spec.rb b/decidim-admin/spec/system/member_import_via_csv_spec.rb
index 8be1fb11dfe3f..8e38f2f22e3ed 100644
--- a/decidim-admin/spec/system/member_import_via_csv_spec.rb
+++ b/decidim-admin/spec/system/member_import_via_csv_spec.rb
@@ -30,7 +30,7 @@
context "when there are existing users" do
before do
- create_list(:assembly_member, 3, participatory_space: assembly, user: create(:user, organization: assembly.organization))
+ create_list(:assembly_member, 3, participatory_space: assembly, organization: assembly.organization)
visit current_path
end
diff --git a/decidim-admin/spec/system/member_spec.rb b/decidim-admin/spec/system/member_spec.rb
index 2afe0b3eec5e7..06f6053943b7c 100644
--- a/decidim-admin/spec/system/member_spec.rb
+++ b/decidim-admin/spec/system/member_spec.rb
@@ -8,7 +8,7 @@
let!(:user) { create(:user, :admin, :confirmed, organization:) }
let(:assembly) { create(:assembly, organization:, has_members: true) }
- let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, user: create(:user, organization: assembly.organization)) }
+ let!(:members) { create_list(:assembly_member, 26, participatory_space: assembly, organization: assembly.organization) }
before do
switch_to_host(organization.host)
diff --git a/decidim-ai/lib/decidim/ai.rb b/decidim-ai/lib/decidim/ai.rb
index 87aaf1f9d8653..18ef28036508a 100644
--- a/decidim-ai/lib/decidim/ai.rb
+++ b/decidim-ai/lib/decidim/ai.rb
@@ -7,7 +7,5 @@ module Ai
autoload :StrategyRegistry, "decidim/ai/strategy_registry"
autoload :SpamDetection, "decidim/ai/spam_detection/spam_detection"
autoload :Language, "decidim/ai/language/language"
-
- include ActiveSupport::Configurable
end
end
diff --git a/decidim-ai/lib/decidim/ai/engine.rb b/decidim-ai/lib/decidim/ai/engine.rb
index 81c0cff9a4eb7..02dcec0a4ccd0 100644
--- a/decidim-ai/lib/decidim/ai/engine.rb
+++ b/decidim-ai/lib/decidim/ai/engine.rb
@@ -117,18 +117,6 @@ class Engine < ::Rails::Engine
.perform_later(data[:resource],
data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
end
- ActiveSupport::Notifications.subscribe("decidim.proposals.create_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
- ActiveSupport::Notifications.subscribe("decidim.proposals.update_collaborative_draft:after") do |_event_name, data|
- Decidim::Ai::SpamDetection::GenericSpamAnalyzerJob
- .set(wait: Decidim::Ai::SpamDetection.spam_detection_delay)
- .perform_later(data[:resource],
- data.dig(:extra, :event_author), data.dig(:extra, :locale), [:body, :title])
- end
end
end
diff --git a/decidim-ai/lib/decidim/ai/language/language.rb b/decidim-ai/lib/decidim/ai/language/language.rb
index 6e74db26f4348..d72d165ab4236 100644
--- a/decidim-ai/lib/decidim/ai/language/language.rb
+++ b/decidim-ai/lib/decidim/ai/language/language.rb
@@ -4,7 +4,14 @@ module Decidim
module Ai
module Language
autoload :Formatter, "decidim/ai/language/formatter"
- include ActiveSupport::Configurable
+
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
# Text cleanup service
#
@@ -15,9 +22,7 @@ module Language
# # your code
# end
# end
- config_accessor :formatter do
- Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
- end
+ mattr_accessor :formatter, default: Decidim::Env.new("DECIDIM_AI_LANGUAGE_FORMATTER", "Decidim::Ai::Language::Formatter").value
end
end
end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb b/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
deleted file mode 100644
index 7a9f044de545f..0000000000000
--- a/decidim-ai/lib/decidim/ai/spam_detection/resource/collaborative_draft.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
- module Ai
- module SpamDetection
- module Resource
- class CollaborativeDraft < Base
- def fields = [:body, :title]
-
- protected
-
- def query = Decidim::Proposals::CollaborativeDraft.includes(:moderation)
- end
- end
- end
- end
-end
diff --git a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
index 61bcb72c7a0ec..80d691ce1076d 100644
--- a/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
+++ b/decidim-ai/lib/decidim/ai/spam_detection/spam_detection.rb
@@ -3,8 +3,6 @@
module Decidim
module Ai
module SpamDetection
- include ActiveSupport::Configurable
-
autoload :Service, "decidim/ai/spam_detection/service"
module Resource
@@ -13,7 +11,6 @@ module Resource
autoload :Debate, "decidim/ai/spam_detection/resource/debate"
autoload :Initiative, "decidim/ai/spam_detection/resource/initiative"
autoload :Proposal, "decidim/ai/spam_detection/resource/proposal"
- autoload :CollaborativeDraft, "decidim/ai/spam_detection/resource/collaborative_draft"
autoload :Meeting, "decidim/ai/spam_detection/resource/meeting"
autoload :UserBaseEntity, "decidim/ai/spam_detection/resource/user_base_entity"
end
@@ -28,31 +25,31 @@ module Strategy
autoload :Bayes, "decidim/ai/spam_detection/strategy/bayes"
end
+ class << self
+ def config = self
+
+ def configure
+ yield self
+ end
+ end
+
# When the engine is consistently marking spam content without errors,
# you can skip human intervention by enabling this functionality
- config_accessor :hide_reported_resources_automatically do
- Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
- end
+ mattr_accessor :hide_reported_resources_automatically, default: Decidim::Env.new("DECIDIM_SPAM_HIDE_REPORTED_RESOURCES_AUTOMATICALLY", false).present?
# This is the email address used by the spam engine to
# properly identify the user that will report users and content
- config_accessor :reporting_user_email do
- Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
- end
+ mattr_accessor :reporting_user_email, default: Decidim::Env.new("DECIDIM_SPAM_REPORTING_USER", "decidim-reporting-user@example.org").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :resource_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :resource_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SCORE_THRESHOLD", 0.75).to_f
# You can configure the spam delay for the spam detection service.
# The default value is 30 seconds
- config_accessor :spam_detection_delay do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
- end
+ mattr_accessor :spam_detection_delay, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_DELAY_IN_SECONDS", 30).to_i.seconds
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -71,49 +68,41 @@ module Strategy
# }
# }
# }
- config_accessor :resource_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
- }
+ mattr_accessor :resource_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_RESOURCE_URL", "redis://localhost:6379/2") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method. or even define own resource visibility criteria.
# This is the place where new resources can be registered following the pattern
# Resource => Handler
- config_accessor :resource_models do
- @models ||= begin
- models = {}
- models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
- models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
- models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
- models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
- models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
- models["Decidim::Proposals::CollaborativeDraft"] = "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" if Decidim.module_installed?("proposals")
- models
- end
+ mattr_accessor :resource_models
+ self.resource_models ||= begin
+ models = {}
+ models["Decidim::Comments::Comment"] = "Decidim::Ai::SpamDetection::Resource::Comment" if Decidim.module_installed?("comments")
+ models["Decidim::Debates::Debate"] = "Decidim::Ai::SpamDetection::Resource::Debate" if Decidim.module_installed?("debates")
+ models["Decidim::Initiative"] = "Decidim::Ai::SpamDetection::Resource::Initiative" if Decidim.module_installed?("initiatives")
+ models["Decidim::Meetings::Meeting"] = "Decidim::Ai::SpamDetection::Resource::Meeting" if Decidim.module_installed?("meetings")
+ models["Decidim::Proposals::Proposal"] = "Decidim::Ai::SpamDetection::Resource::Proposal" if Decidim.module_installed?("proposals")
+ models
end
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :resource_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :resource_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_RESOURCE_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# You can configure the spam threshold for the spam detection service.
# The threshold is a float value between 0 and 1.
# The default value is 0.75
# Any value below the threshold will be considered spam.
- config_accessor :user_score_threshold do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
- end
+ mattr_accessor :user_score_threshold, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SCORE_THRESHOLD", 0.75).to_f
# Registered analyzers.
# You can register your own analyzer by adding a new entry to this array.
@@ -132,32 +121,24 @@ module Strategy
# }
# }
# }
- config_accessor :user_analyzers do
- [
- {
- name: :bayes,
- strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
- options: {
- adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
- params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
- }
+ mattr_accessor :user_analyzers, default: [
+ {
+ name: :bayes,
+ strategy: Decidim::Ai::SpamDetection::Strategy::Bayes,
+ options: {
+ adapter: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER", "redis"),
+ params: { url: ENV.fetch("DECIDIM_SPAM_DETECTION_BACKEND_USER_REDIS_URL", "redis://localhost:6379/3") }
}
- ]
- end
+ }
+ ]
- # This config_accessor allows the implementers to change the class being used by the classifier,
+ # This setting allows the implementers to change the class being used by the classifier,
# in order to change the finder method or what a hidden user really is.
- config_accessor :user_models do
- {
- "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity"
- }
- end
+ mattr_accessor :user_models, default: { "Decidim::User" => "Decidim::Ai::SpamDetection::Resource::UserBaseEntity" }
# Spam detection service class.
# If you want to use a different spam detection service, you can use a class service having the following contract
- config_accessor :user_detection_service do
- Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
- end
+ mattr_accessor :user_detection_service, default: Decidim::Env.new("DECIDIM_SPAM_DETECTION_USER_SERVICE", "Decidim::Ai::SpamDetection::Service").value
# this is the generic resource classifier class. If you need to change your own class, please change the
# configuration of `Decidim::Ai::SpamDetection.detection_service` variable.
diff --git a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
deleted file mode 100644
index 247dd8953c591..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_creates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User creates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) { Decidim::Proposals::CreateCollaborativeDraft.new(form, author) }
-
- include_examples "Collaborative draft spam analysis"
-end
diff --git a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb b/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
deleted file mode 100644
index 563b125e174ee..0000000000000
--- a/decidim-ai/spec/event_handlers/proposals/user_updates_collaborative_draft_spec.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "User updates collaborative draft", type: :system do
- let(:form) do
- Decidim::Proposals::CollaborativeDraftForm.from_params(
- title:,
- body:,
- address: nil,
- has_address: false,
- latitude: 40.1234,
- longitude: 2.1234,
- add_documents: nil
- ).with_context(
- current_user: author,
- current_organization: organization,
- current_participatory_space: participatory_space,
- current_component: component
- )
- end
-
- let(:command) do
- Decidim::Proposals::UpdateCollaborativeDraft.new(form, author, collaborative_draft)
- end
-
- include_examples "Collaborative draft spam analysis" do
- let!(:collaborative_draft) do
- create(:collaborative_draft,
- component:,
- users: [author],
- title: "Some draft that is not blocked",
- body: "The body for the proposal.")
- end
- end
-end
diff --git a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
index 0cb1ddaf4fd1a..9b2eab63a0d89 100644
--- a/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
+++ b/decidim-ai/spec/lib/decidim/ai/spam_detection/importer/database_spec.rb
@@ -103,18 +103,6 @@
include_examples "some resources are being spam"
end
- context "when trained model is Decidim::Proposals::CollaborativeDraft" do
- let(:manifest_name) { "proposals" }
- let(:training) { 8 }
-
- let!(:reportable) { create(:collaborative_draft, component:, users: [author], title: "Hidden resource") }
- let!(:resources) { create_list(:collaborative_draft, 3, component:, users: [author]) }
- let(:resource_models) { { "Decidim::Proposals::CollaborativeDraft" => "Decidim::Ai::SpamDetection::Resource::CollaborativeDraft" } }
-
- include_examples "resource is being indexed"
- include_examples "some resources are being spam"
- end
-
context "when trained model is Decidim::Debates::Debate" do
let(:manifest_name) { "debates" }
let(:training) { 8 }
diff --git a/decidim-ai/spec/shared/events_examples.rb b/decidim-ai/spec/shared/events_examples.rb
index 6cdfc2df6d30b..c90dd5d4fc5da 100644
--- a/decidim-ai/spec/shared/events_examples.rb
+++ b/decidim-ai/spec/shared/events_examples.rb
@@ -172,7 +172,7 @@
context "when regular content is added" do
let(:description) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -200,7 +200,7 @@
context "when regular content is added" do
let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
+ let(:title) { "This is the draft title" }
include_examples "content submitted to spam analysis" do
let(:spam_count) { 0 }
@@ -210,31 +210,3 @@
end
end
end
-
-shared_examples "Collaborative draft spam analysis" do
- context "when spam content is added" do
- let(:body) { "Claim your prize today so you can win." }
- let(:title) { "You are the Lucky winner" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 1 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-
- context "when regular content is added" do
- let(:body) { "Very nice idea that is not going to be blocked by engine" }
- let(:title) { "This is the collaborative draft title" }
-
- include_examples "content submitted to spam analysis" do
- let(:component) { create(:proposal_component, :with_collaborative_drafts_enabled, participatory_space:) }
- let(:spam_count) { 0 }
- let(:compared_field) { :body }
- let(:compared_against) { body }
- let(:resource) { Decidim::Proposals::CollaborativeDraft }
- end
- end
-end
diff --git a/decidim-api/app/controllers/decidim/api/sessions_controller.rb b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
index 97011840cf0bd..6299128062f1c 100644
--- a/decidim-api/app/controllers/decidim/api/sessions_controller.rb
+++ b/decidim-api/app/controllers/decidim/api/sessions_controller.rb
@@ -45,7 +45,7 @@ def respond_with(resource, _opts = {})
render json: serialized_user.merge("avatar" => nil)
end
- def respond_to_on_destroy
+ def respond_to_on_destroy(*)
head :ok
end
diff --git a/decidim-api/decidim-api.gemspec b/decidim-api/decidim-api.gemspec
index 479b5af792aa2..3adeff8e3035b 100644
--- a/decidim-api/decidim-api.gemspec
+++ b/decidim-api/decidim-api.gemspec
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
end
s.add_dependency "decidim-core", version
- s.add_dependency "devise-jwt", "~> 0.12.1"
+ s.add_dependency "devise-jwt", ">= 0.12.1", "< 0.14.0"
s.add_dependency "graphql", ">= 2.4.17", "< 2.6"
- s.add_dependency "graphql-docs", "~> 5.0"
- s.add_dependency "rack-cors", "~> 1.0"
+ s.add_dependency "graphql-docs", ">= 5", "< 7"
+ s.add_dependency "rack-cors", ">= 1", "< 4"
s.add_development_dependency "decidim-assemblies", version
s.add_development_dependency "decidim-comments", version
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
index 11f9beec80ec2..632f18eb5e53e 100644
--- a/decidim-api/lib/decidim/api.rb
+++ b/decidim-api/lib/decidim/api.rb
@@ -11,54 +11,44 @@ module Decidim
# This module holds all business logic related to exposing a Public API for
# decidim.
module Api
- include ActiveSupport::Configurable
+ class << self
+ def config = self
- # defines the schema max_per_page to configure GraphQL pagination
- config_accessor :schema_max_per_page do
- Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+ def configure
+ yield self
+ end
end
+ # defines the schema max_per_page to configure GraphQL pagination
+ mattr_accessor :schema_max_per_page, default: Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
+
# defines the schema max_complexity to configure GraphQL query complexity
- config_accessor :schema_max_complexity do
- Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
- end
+ mattr_accessor :schema_max_complexity, default: Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
# defines how many aliases are permitted in a query
- config_accessor :max_aliases do
- Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
- end
+ mattr_accessor :max_aliases, default: Decidim::Env.new("API_SCHEMA_MAX_ALIASES", 5).to_i
# defines the schema max_depth to configure GraphQL query max_depth
- config_accessor :schema_max_depth do
- Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- end
+ mattr_accessor :schema_max_depth, default: Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
- config_accessor :disclose_system_version do
- Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
- end
+ mattr_accessor :disclose_system_version, default: Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
# makes the API authentication necessary in order to access it
# access it.
- config_accessor :force_api_authentication do
- Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
- end
+ mattr_accessor :force_api_authentication, default: Decidim::Env.new("DECIDIM_API_FORCE_API_AUTHENTICATION", nil).present?
# allows anonymous introspection queries
# If you are not sure, leave it set to false. In this way only administrator users will be able to access the introspection query.
# Otherwise, anyone can access it, causing security issues.
- config_accessor :enable_anonymous_introspection do
- Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
- end
+ mattr_accessor :enable_anonymous_introspection, default: Decidim::Env.new("DECIDIM_API_ENABLE_ANONYMOUS_INTROSPECTION", nil).present?
# The expiration time of the JWT tokens, after which issued token will
# expire. Recommended to match the value of
# `DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN`.
- config_accessor :jwt_expires_in do
- Decidim::Env.new(
- "DECIDIM_API_JWT_EXPIRES_IN",
- Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
- ).to_i
- end
+ mattr_accessor :jwt_expires_in, default: Decidim::Env.new(
+ "DECIDIM_API_JWT_EXPIRES_IN",
+ Decidim::Env.new("DECIDIM_OAUTH_ACCESS_TOKEN_EXPIRES_IN", "120").value
+ ).to_i
# This declares all the types an interface or union can resolve to. This needs
# to be done in order to be able to have them found. This is a shortcoming of
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
index 8a45ea3178273..af78fe6474a65 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/create_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when creating a new assembly
# in the system.
class CreateAssembly < Decidim::Commands::CreateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
:promoted, :taxonomizations, :parent, :organization,
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
index 3042adeeded07..901f911460d51 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/duplicate_assembly.rb
@@ -63,7 +63,7 @@ def duplicate_assembly
end
def duplicate_assembly_attachments
- [:hero_image, :banner_image].each do |attribute|
+ [:hero_image].each do |attribute|
next unless @assembly.attached_uploader(attribute).attached?
@duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)
diff --git a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
index e91d4df267451..5747fa541ca5e 100644
--- a/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
+++ b/decidim-assemblies/app/commands/decidim/assemblies/admin/update_assembly.rb
@@ -6,7 +6,7 @@ module Admin
# A command with all the business logic when updating a new assembly
# in the system.
class UpdateAssembly < Decidim::Commands::UpdateResource
- fetch_file_attributes :hero_image, :banner_image
+ fetch_file_attributes :hero_image
fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
:taxonomizations, :parent, :private_space, :developer_group, :local_area,
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
index 0c0d4f6753e0d..9bafd2fcb00b2 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assemblies_controller.rb
@@ -37,7 +37,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
@@ -63,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
- render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+ render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
index e5e6fcf6d2299..012fa88b7f97a 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_duplicates_controller.rb
@@ -25,7 +25,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
index f453269c3876e..d6b4bcc7cc644 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/assembly_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
- render :new, status: :unprocessable_entity
+ render :new, status: :unprocessable_content
end
end
end
diff --git a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
index 31b07defed14e..afb1fd8012218 100644
--- a/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
+++ b/decidim-assemblies/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb
@@ -19,6 +19,7 @@ module AssemblyAdmin
included do
include Decidim::Admin::ParticipatorySpaceAdminContext
+
helper_method :current_assembly
add_breadcrumb_item_from_menu :admin_assembly_menu
diff --git a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
index 5ab89729e7c4a..cbbfd81cf55d5 100644
--- a/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
+++ b/decidim-assemblies/app/forms/decidim/assemblies/admin/assembly_form.rb
@@ -54,9 +54,7 @@ class AssemblyForm < Form
attribute :duration, Decidim::Attributes::LocalizedDate
attribute :included_at, Decidim::Attributes::LocalizedDate
- attribute :banner_image
attribute :hero_image
- attribute :remove_banner_image, Boolean, default: false
attribute :remove_hero_image, Boolean, default: false
validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,7 +67,6 @@ class AssemblyForm < Form
validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
validates :title, :subtitle, :description, :short_description, translatable_presence: true
- validates :banner_image, passthru: { to: Decidim::Assembly }
validates :hero_image, passthru: { to: Decidim::Assembly }
validates :weight, presence: true
diff --git a/decidim-assemblies/app/models/decidim/assembly.rb b/decidim-assemblies/app/models/decidim/assembly.rb
index 208cc845bae6b..eaacc4dec64a8 100644
--- a/decidim-assemblies/app/models/decidim/assembly.rb
+++ b/decidim-assemblies/app/models/decidim/assembly.rb
@@ -71,9 +71,6 @@ class Assembly < ApplicationRecord
has_one_attached :hero_image
validates_upload :hero_image, uploader: Decidim::HeroImageUploader
- has_one_attached :banner_image
- validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
validates :slug, uniqueness: { scope: :organization }
validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
index 0629e11cc3264..dded25d18a7ea 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js
@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
-
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
-
-
-
diff --git a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
index 8ef195373f662..2dd8a49aa4c97 100644
--- a/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
+++ b/decidim-assemblies/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js
@@ -50,10 +50,6 @@ export default class extends Controller {
if (isTransparentCheckbox) {
isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-
- if (isTransparentCheckbox.checked) {
- isTransparentCheckbox.checked = false;
- }
}
if (specialFeatures) {
diff --git a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
index 024b0b10455f1..ed8f5f43512c5 100644
--- a/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
+++ b/decidim-assemblies/app/presenters/decidim/assemblies/assembly_presenter.rb
@@ -9,10 +9,6 @@ def hero_image_url
assembly.attached_uploader(:hero_image).url
end
- def banner_image_url
- assembly.attached_uploader(:banner_image).url
- end
-
def area_name
return if assembly.area.blank?
diff --git a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
index 35be379dc5886..8779856149558 100644
--- a/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
+++ b/decidim-assemblies/app/queries/decidim/assemblies/admin/admin_users.rb
@@ -42,7 +42,7 @@ def query
def assemblies_user_admins
Decidim::User.where(
id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
- .select(:decidim_user_id)
+ .select(:decidim_user_id)
)
end
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
index b0b825f029a1f..28900d7a89b9c 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/assembly_importer.rb
@@ -60,8 +60,6 @@ def import(attributes, _user, opts)
meta_scope: attributes["meta_scope"]
)
import_hero_image(attributes["remote_hero_image_url"])
- import_banner_image(attributes["remote_banner_image_url"])
-
@imported_assembly.save!
@imported_assembly
end
@@ -84,27 +82,24 @@ def import_folders_and_attachments(attachments)
next
end
- begin
- file_tmp = URI.parse(url).open
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t(
- "decidim.assemblies.admin.imports.attachment_error",
- title: attachment_title(file),
- error: format_error(e)
- )
- next
- end
-
Decidim.traceability.perform_action!("create", Attachment, @user) do
attachment = Attachment.new(
title: file["title"],
description: file["description"],
- content_type: file_tmp.content_type,
attached_to: @imported_assembly,
- weight: file["weight"],
- file: file_tmp, # Define attached_to before this
- file_size: file_tmp.size
+ weight: file["weight"]
)
+ begin
+ attachment.attached_uploader(:file).remote_url = url
+ attachment.set_content_type_and_size
+ rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
+ @warnings << I18n.t(
+ "decidim.assemblies.admin.imports.attachment_error",
+ title: attachment_title(file),
+ error: format_error(e)
+ )
+ next
+ end
attachment.create_attachment_collection(file["attachment_collection"])
attachment.save!
attachment
@@ -180,14 +175,6 @@ def import_hero_image(url)
@warnings << I18n.t("decidim.assemblies.admin.imports.hero_image_error", error: format_error(e))
end
- def import_banner_image(url)
- return if url.blank?
-
- @imported_assembly.attached_uploader(:banner_image).remote_url = url
- rescue OpenURI::HTTPError, Errno::ENOENT, Errno::ECONNREFUSED, SocketError, Net::OpenTimeout, Net::ReadTimeout => e
- @warnings << I18n.t("decidim.assemblies.admin.imports.banner_image_error", error: format_error(e))
- end
-
def format_error(error)
return error.message unless error.respond_to?(:io) && error.io.respond_to?(:status)
diff --git a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
index a6dcfb2f4c0f5..4a5b77bb6aad2 100644
--- a/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
+++ b/decidim-assemblies/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb
@@ -12,7 +12,6 @@ def serialize
url: EngineRouter.main_proxy(resource).assembly_url(resource),
subtitle: resource.subtitle,
remote_hero_image_url: Decidim::ParticipatoryProcesses::ParticipatoryProcessPresenter.new(resource).hero_image_url,
- remote_banner_image_url: Decidim::Assemblies::AssemblyPresenter.new(resource).banner_image_url,
developer_group: resource.developer_group,
local_area: resource.local_area,
meta_scope: resource.meta_scope,
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
index 861ca7914d867..e176aa7db01cd 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/_form.html.erb
@@ -98,10 +98,6 @@
<%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
-
-
- <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
index d6ed716e4f028..41801f6c9ac24 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
+<% add_decidim_page_title(t(".title")) %>
+
- <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
index faa12dc4037a2..f8aa07760af84 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.html.erb
@@ -1,4 +1,5 @@
-<% add_decidim_page_title(t("assemblies", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
+
<% if parent_assembly && parent_assembly.self_and_ancestors.length %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
index 41626d1357ee0..1434001b85107 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/index.js.erb
@@ -6,7 +6,7 @@ $('[data-assembly-id="<%= parent_assembly_id %>"]').after(
);
// Dispatch the `ajax:loaded` event with the newly inserted element
-const insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
+var insertedElement = $('[data-assembly-id="<%= parent_assembly_id %>"]').next()[0];
document.dispatchEvent(new CustomEvent("ajax:loaded", { detail: insertedElement }));
var component = new window.Decidim.AdminAssembliesListComponent();
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
index f98ba34f2a9bc..097a30bc1b2f3 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/manage_trash.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies_deleted", scope: "decidim.admin.titles")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
index d08339df210cd..95e2ade99b9dc 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assemblies/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t "assemblies.new.title", scope: "decidim.admin" %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
index 18f2eca3dc5c9..dea867b78ac4e 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_duplicates/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_duplicates.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
index b5d593aa340de..f54582cc75785 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_imports/new.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_imports.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
index 45d96fe525a54..b271eed7173f4 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
index aad6260fb5fcd..1afef5e5df6e1 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb
@@ -1,8 +1,8 @@
-<% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
+ <%= t(".title") %>
<% if allowed_to? :create, :assembly_user_role %>
<%= link_to t("actions.new_assembly_user_role", scope: "decidim.admin"), new_assembly_user_role_path(current_assembly), class: "button button__sm button__secondary new" %>
<% end %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
index 570517cea9aa0..765c729002a52 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb
@@ -1,7 +1,7 @@
-<% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
+<% add_decidim_page_title(t(".title")) %>
- <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
+ <%= t(".title") %>
diff --git a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
index 3fb3b7d068099..6bafa56d3e0ce 100644
--- a/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
+++ b/decidim-assemblies/app/views/decidim/assemblies/members/index.html.erb
@@ -1,4 +1,4 @@
-<% add_decidim_page_title(t("assembly_members.index.title", scope: "decidim")) %>
+<% add_decidim_page_title(t("members", scope: "decidim.participatory_space_members.index")) %>
<% add_decidim_meta_tags(
title: translated_attribute(current_participatory_space.title),
resource: current_participatory_space) %>
@@ -11,13 +11,14 @@ edit_link(
)
%>
-<%= cell "decidim/content_blocks/participatory_space_hero", nil, resource: current_participatory_space %>
-
-
- <%= t("members", scope: "decidim.assemblies.assembly_members.index") %>
- <%= collection.size %>
-
-
+<% content_for :aside do %>
+
+ <%= t("members", scope: "decidim.participatory_space_members.index") %>
+
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
<%= render(collection) %>
-
-
+
+<% end %>
diff --git a/decidim-assemblies/config/locales/en.yml b/decidim-assemblies/config/locales/en.yml
index 9e01c707a6196..cd68e71cb2001 100644
--- a/decidim-assemblies/config/locales/en.yml
+++ b/decidim-assemblies/config/locales/en.yml
@@ -107,11 +107,8 @@ en:
public: Public
published: Published
unpublished: Unpublished
- manage_trash:
- title: Deleted assemblies
new:
create: Create
- title: New assembly
update:
error: There was a problem updating this assembly.
success: Assembly successfully updated.
@@ -123,7 +120,6 @@ en:
new:
duplicate: Duplicate
select: Select which data you would like to duplicate
- title: Duplicate assembly
assembly_imports:
create:
error: There was a problem importing this assembly.
@@ -131,7 +127,6 @@ en:
new:
import: Import
select: Select which data you would like to import
- title: Import assembly
assembly_publications:
create:
error: There was a problem publishing this assembly.
@@ -146,13 +141,9 @@ en:
destroy:
success: Admin successfully removed from this assembly.
edit:
- title: Update assembly admin
update: Update
- index:
- assembly_admins_title: Assembly admins
new:
create: Create
- title: New assembly admin
update:
error: There was a problem updating an admin for this assembly.
success: Admin updated successfully for this assembly.
@@ -210,8 +201,6 @@ en:
space_filter_for:
assemblies: All assemblies
titles:
- assemblies: Assemblies
- assemblies_deleted: Deleted assemblies
assemblies_types: Assemblies types
tooltips:
deleted_assemblies_info: An assembly can only be deleted if status is "Unpublished".
@@ -247,6 +236,8 @@ en:
assemblies:
admin:
assemblies:
+ edit:
+ title: About this assembly
form:
define_taxonomy_filters: Please define some filters for this participatory space before using this setting.
duration: Duration
@@ -265,24 +256,40 @@ en:
taxonomies: Taxonomies
title: General Information
visibility: Visibility
+ index:
+ title: Assemblies
+ manage_trash:
+ title: Deleted assemblies
+ new:
+ title: New assembly
assembly_duplicates:
form:
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Duplicate assembly
assembly_imports:
form:
document_legend: Add a document
slug_help_html: 'URL slugs are used to generate the URLs that point to this assembly. Only accepts letters, numbers and dashes, and must start with a letter. Example: %{url}'
+ new:
+ title: Import assembly
assembly_members:
form:
explanation: 'Guidance for image:'
image_guide: Preferably a portrait image that does not have any text.
non_user_avatar_help: You should get the consent of the persons before publishing them as a member.
+ assembly_user_roles:
+ edit:
+ title: Update assembly admin
+ index:
+ title: Assembly admins
+ new:
+ title: New assembly admin
content_blocks:
highlighted_assemblies:
max_results: Maximum amount of elements to show
imports:
attachment_error: The attachment "%{title}" could not be imported (%{error}).
- banner_image_error: The banner image could not be imported (%{error}).
hero_image_error: The hero image could not be imported (%{error}).
new_import:
accepted_types:
@@ -311,9 +318,6 @@ en:
type: Type
show:
title: About this assembly
- assembly_members:
- index:
- members: Members
content_blocks:
children_assemblies:
name: Assemblies
@@ -355,9 +359,6 @@ en:
duration: Duration
private_space: This is a private assembly
social_networks_title: Visit assembly on
- assembly_members:
- index:
- title: Members
download_your_data:
show:
assemblies: Assemblies export
diff --git a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
index f5dbd012845c8..063ce22662adc 100644
--- a/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
+++ b/decidim-assemblies/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb
@@ -7,10 +7,10 @@ def change
# required so that test suite works in ci env
enable_extension "ltree"
rescue StandardError
- raise <<-MSG.squish
- Decidim requires the ltree extension to be enabled in your PostgreSQL.
- You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
- super user.
+ raise <<~MSG.squish
+ Decidim requires the ltree extension to be enabled in your PostgreSQL.
+ You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+ super user.
MSG
end
end
diff --git a/decidim-assemblies/lib/decidim/api/assembly_type.rb b/decidim-assemblies/lib/decidim/api/assembly_type.rb
index 1405d7e2aec10..5205f6f7cecab 100644
--- a/decidim-assemblies/lib/decidim/api/assembly_type.rb
+++ b/decidim-assemblies/lib/decidim/api/assembly_type.rb
@@ -17,7 +17,6 @@ class AssemblyType < Decidim::Api::Types::BaseObject
description "An assembly"
- field :banner_image, String, "The banner image for this assembly", null: true
field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
field :children_count, Integer, "Number of children assemblies", null: true
field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
@@ -64,10 +63,6 @@ def url
def hero_image
object.attached_uploader(:hero_image).url
end
-
- def banner_image
- object.attached_uploader(:banner_image).url
- end
end
end
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/engine.rb b/decidim-assemblies/lib/decidim/assemblies/engine.rb
index ebd08fba721d4..2f20677f1623e 100644
--- a/decidim-assemblies/lib/decidim/assemblies/engine.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/engine.rb
@@ -42,13 +42,12 @@ class Engine < ::Rails::Engine
end
get "/assemblies", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies"
}
get "/assemblies/*rest", to: redirect { |params, request|
- locale = params[:locale] || request.session[:user_locale] || I18n.locale
-
+ locale = Decidim::LocaleRouterDetector.new(request, params).locale
"/#{locale}/assemblies/#{params[:rest]}"
}
end
diff --git a/decidim-assemblies/lib/decidim/assemblies/seeds.rb b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
index 4667312ad2f4a..4900aa839bd20 100644
--- a/decidim-assemblies/lib/decidim/assemblies/seeds.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/seeds.rb
@@ -60,7 +60,6 @@ def create_assembly!(parent: nil)
end,
organization:,
hero_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? hero_image : nil, # Keep after organization
- banner_image: ::Faker::Boolean.boolean(true_ratio: 0.5) ? banner_image : nil, # Keep after organization
promoted: true,
published_at: 2.weeks.ago,
meta_scope: Decidim::Faker::Localized.word,
diff --git a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
index cefe5ad3d9a55..b46807b899ffc 100644
--- a/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
+++ b/decidim-assemblies/lib/decidim/assemblies/test/factories.rb
@@ -27,7 +27,6 @@
description { generate_localized_description(:assembly_description, skip_injection:) }
organization
hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") } # Keep after organization
- banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") } # Keep after organization
published_at { Time.current }
deleted_at { nil }
meta_scope { generate_localized_word(:assembly_meta_scope, skip_injection:) }
diff --git a/decidim-assemblies/spec/commands/create_assembly_spec.rb b/decidim-assemblies/spec/commands/create_assembly_spec.rb
index 5b175f3ee64f9..e4952a91aa401 100644
--- a/decidim-assemblies/spec/commands/create_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/create_assembly_spec.rb
@@ -18,7 +18,6 @@ module Decidim::Assemblies
end
let(:related_process_ids) { [participatory_processes.map(&:id)] }
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:taxonomizations) do
2.times.map { build(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: nil) }
end
@@ -34,7 +33,6 @@ module Decidim::Assemblies
slug: "slug",
meta_scope: { en: "meta scope" },
hero_image:,
- banner_image:,
promoted: nil,
developer_group: { en: "developer group" },
local_area: { en: "local" },
@@ -87,7 +85,6 @@ module Decidim::Assemblies
content_type: "image/jpeg"
)
end
- let(:banner_image) { hero_image }
before do
allow(Decidim::ActionLogger).to receive(:log).and_return(true)
@@ -99,7 +96,6 @@ module Decidim::Assemblies
it "adds errors to the form" do
expect(errors).to receive(:add).with(:hero_image, "File resolution is too large")
- expect(errors).to receive(:add).with(:banner_image, "File resolution is too large")
subject.call
end
end
@@ -112,14 +108,12 @@ module Decidim::Assemblies
content_type: "image/png"
)
end
- let(:banner_image) { nil }
let(:form) do
Admin::AssemblyForm.from_params(
title: { en: "title" },
subtitle: { en: "subtitle" },
slug: "slug",
hero_image:,
- banner_image:,
description: { en: "description" },
short_description: { en: "short_description" },
organization:
diff --git a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
index e12aba9a3f132..ee9b46ea875d5 100644
--- a/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/decidim/assemblies/admin/import_assembly_spec.rb
@@ -44,10 +44,6 @@ def stub_calls_to_external_files
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
diff --git a/decidim-assemblies/spec/commands/update_assembly_spec.rb b/decidim-assemblies/spec/commands/update_assembly_spec.rb
index 384d61f6e9732..0af3499198faa 100644
--- a/decidim-assemblies/spec/commands/update_assembly_spec.rb
+++ b/decidim-assemblies/spec/commands/update_assembly_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
2.times.map { create(:taxonomization, taxonomy: create(:taxonomy, :with_parent, organization:), taxonomizable: my_assembly) }
end
let(:taxonomy) { create(:taxonomy, :with_parent, organization:) }
- let(:banner_image) { my_assembly.banner_image }
let(:params) do
{
assembly: {
@@ -69,8 +68,7 @@ module Decidim::Assemblies
end
let(:attachment_params) do
{
- hero_image: hero_image.blob,
- banner_image: banner_image.blob
+ hero_image: hero_image.blob
}
end
let(:context) do
@@ -105,7 +103,6 @@ module Decidim::Assemblies
context "when the uploaded hero image has too large dimensions" do
let(:attachment_params) do
{
- banner_image: banner_image.blob,
hero_image: ActiveStorage::Blob.create_and_upload!(
io: File.open(Decidim::Dev.asset("5000x5000.png")),
filename: "5000x5000.png",
@@ -125,7 +122,6 @@ module Decidim::Assemblies
allow(form).to receive(:invalid?).and_return(false)
expect(my_assembly).to receive(:valid?).at_least(:once).and_return(false)
my_assembly.errors.add(:hero_image, "File resolution is too large")
- my_assembly.errors.add(:banner_image, "File resolution is too large")
end
it "broadcasts invalid" do
@@ -136,7 +132,6 @@ module Decidim::Assemblies
command.call
expect(form.errors[:hero_image]).not_to be_empty
- expect(form.errors[:banner_image]).not_to be_empty
end
end
@@ -176,14 +171,12 @@ module Decidim::Assemblies
expect(linked_participatory_processes).to match_array(participatory_processes)
end
- context "when homepage image is not updated" do
+ context "when hero image is not updated" do
let(:attachment_params) do
- {
- banner_image: banner_image.blob
- }
+ {}
end
- it "does not replace the homepage image" do
+ it "does not replace the hero image" do
expect(my_assembly).not_to receive(:hero_image=)
command.call
@@ -193,23 +186,6 @@ module Decidim::Assemblies
end
end
- context "when banner image is not updated" do
- let(:attachment_params) do
- {
- hero_image: hero_image.blob
- }
- end
-
- it "does not replace the banner image" do
- expect(my_assembly).not_to receive(:banner_image=)
-
- command.call
- my_assembly.reload
-
- expect(my_assembly.banner_image).to be_present
- end
- end
-
context "when updating the parent assembly" do
let!(:parent_assembly) { create(:assembly, organization:) }
diff --git a/decidim-assemblies/spec/forms/assembly_form_spec.rb b/decidim-assemblies/spec/forms/assembly_form_spec.rb
index cb707515ee6db..6b37e015f9025 100644
--- a/decidim-assemblies/spec/forms/assembly_form_spec.rb
+++ b/decidim-assemblies/spec/forms/assembly_form_spec.rb
@@ -120,7 +120,6 @@ module Admin
"short_description_es" => short_description[:es],
"short_description_ca" => short_description[:ca],
"hero_image" => attachment,
- "banner_image" => attachment,
"slug" => slug,
"private_space" => private_space,
"has_members" => has_members,
@@ -185,7 +184,7 @@ module Admin
it { is_expected.not_to be_valid }
end
- context "when attachment (hero_image or banner_image) is too big" do
+ context "when attachment (hero_image) is too big" do
before do
organization.settings.tap do |settings|
settings.upload.maximum_file_size.default = 5
@@ -298,7 +297,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
@@ -351,7 +349,6 @@ module Admin
slug: "another-slug",
meta_scope: assembly.meta_scope,
hero_image: nil,
- banner_image: nil,
promoted: assembly.promoted,
description_en: assembly.description,
description_ca: assembly.description,
diff --git a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
index e4e50af28d4ad..dc43eac7cab3d 100644
--- a/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
+++ b/decidim-assemblies/spec/presenters/decidim/assemblies/assembly_presenter_spec.rb
@@ -12,26 +12,17 @@ module Decidim
describe "when no images were uploaded" do
before do
assembly.hero_image.purge
- assembly.banner_image.purge
end
it "return nil for hero_image_url" do
expect(subject.hero_image_url).to be_nil
end
-
- it "return nil for banner_image_url" do
- expect(subject.banner_image_url).to be_nil
- end
end
describe "when images are attached" do
it "resolves hero_image_url" do
expect(subject.hero_image_url).to be_blob_url(assembly.hero_image.blob)
end
-
- it "resolves banner_image_url" do
- expect(subject.banner_image_url).to be_blob_url(assembly.banner_image.blob)
- end
end
end
end
diff --git a/decidim-assemblies/spec/requests/redirect_routes_spec.rb b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
new file mode 100644
index 0000000000000..ad28fe824faf9
--- /dev/null
+++ b/decidim-assemblies/spec/requests/redirect_routes_spec.rb
@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Redirect routes" do
+ let(:organization) { create(:organization, available_locales: %w(en es ca), default_locale: "en") }
+ let(:headers) { { "HOST" => organization.host } }
+
+ it "redirects old url with missing locale" do
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale" do
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+
+ it "redirects to default locale when the locale is invalid" do
+ get("/assemblies?locale=esp", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/en/assemblies")
+ end
+
+ it "redirects old url with locale and additional params" do
+ get("/assemblies/foo-bar?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies/foo-bar")
+ end
+
+ it "redirects user to the new url" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/ca/assemblies")
+ end
+
+ it "redirects user to the new url when using custom locale" do
+ user = create(:user, :confirmed, organization:, locale: "ca")
+ login_as user, scope: :user
+
+ get("/", headers:)
+ get("/assemblies?locale=es", headers:)
+ expect(response).to have_http_status(:moved_permanently)
+ expect(response).to redirect_to("/es/assemblies")
+ end
+end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
index f7c15cbab8bc3..50e7761e4d336 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_importer_spec.rb
@@ -51,12 +51,10 @@ module Decidim::Assemblies
"created_by" => "citizens",
"meta_scope" => Decidim::Faker::Localized.sentence(word_count: 3),
"announcement" => Decidim::Faker::Localized.wrapped("", "
") { generate_localized_title },
- "remote_hero_image_url" => hero_image_url,
- "remote_banner_image_url" => banner_image_url
+ "remote_hero_image_url" => hero_image_url
}
end
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly correctly" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
@@ -139,95 +137,22 @@ module Decidim::Assemblies
end
end
- context "when banner image URL is present and accessible" do
- let(:banner_image_url) { "http://example.com/banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, banner_image_url)
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
- end
-
- it "imports the assembly with the banner image" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- expect(subject.banner_image).to be_attached
- end
-
- it "has no warnings" do
- subject
- expect(importer.warnings).to be_empty
- end
- end
-
- context "when banner image URL returns 404 error" do
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "does not attach the banner image" do
- subject
- expect(subject.banner_image).not_to be_attached
- end
-
- it "collects a warning about the missing banner image" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported \(404 Not Found\)\./i))
- end
- end
-
- context "when both hero and banner images fail to import" do
- let(:hero_image_url) { "http://example.com/missing-hero.jpg" }
- let(:banner_image_url) { "http://example.com/missing-banner.jpg" }
-
- before do
- stub_request(:get, hero_image_url).to_return(status: 404)
- stub_request(:head, hero_image_url).to_return(status: 404)
- stub_request(:get, banner_image_url).to_return(status: 500)
- stub_request(:head, banner_image_url).to_return(status: 500)
- end
-
- it "imports the assembly successfully" do
- expect { subject }.to change(Decidim::Assembly, :count).by(1)
- end
-
- it "collects warnings for both images" do
- subject
- expect(importer.warnings).to include(a_string_matching(/The hero image could not be imported/i))
- expect(importer.warnings).to include(a_string_matching(/The banner image could not be imported/i))
- expect(importer.warnings.length).to eq(2)
- end
- end
-
context "when image URL is nil" do
let(:hero_image_url) { nil }
- let(:banner_image_url) { nil }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
context "when image URL is empty string" do
let(:hero_image_url) { "" }
- let(:banner_image_url) { "" }
it "imports the assembly without images and no warnings" do
expect { subject }.to change(Decidim::Assembly, :count).by(1)
expect(subject.hero_image).not_to be_attached
- expect(subject.banner_image).not_to be_attached
expect(importer.warnings).to be_empty
end
end
@@ -311,6 +236,114 @@ module Decidim::Assemblies
expect(importer.warnings).to include(a_string_matching(/The attachment "Test File" could not be imported \(500 Internal Server Error\)\./i))
end
end
+
+ context "when remote file is accessible and downloadable (PDF)" do
+ let(:remote_file_url) { "http://example.com/document.pdf" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "application/pdf" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("Exampledocument.pdf")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ expect(attachment.file.filename.to_s).to eq("document.pdf")
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("application/pdf")
+ end
+
+ it "sets the file size automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file_size).to be_present
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file is accessible and downloadable (image)" do
+ let(:remote_file_url) { "http://example.com/image.jpg" }
+
+ before do
+ stub_request(:head, remote_file_url)
+ .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
+ stub_request(:get, remote_file_url)
+ .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
+ end
+
+ it "successfully imports the attachment" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .to change(Decidim::Attachment, :count).by(1)
+ end
+
+ it "attaches the file to the assembly" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.file).to be_attached
+ end
+
+ it "sets the content type automatically" do
+ importer.import_folders_and_attachments(attachments_data)
+ attachment = Decidim::Attachment.last
+ expect(attachment.content_type).to eq("image/jpeg")
+ end
+
+ it "has no warnings" do
+ importer.import_folders_and_attachments(attachments_data)
+ expect(importer.warnings).to be_empty
+ end
+ end
+
+ context "when remote file URL is blank" do
+ let(:attachments_data) do
+ {
+ "files" => [
+ {
+ "title" => { "en" => "Test File" },
+ "description" => { "en" => "Test Description" },
+ "weight" => 1,
+ "remote_file_url" => ""
+ }
+ ],
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
+
+ context "when files array is nil" do
+ let(:attachments_data) do
+ {
+ "files" => nil,
+ "attachment_collections" => []
+ }
+ end
+
+ it "does not create any attachments" do
+ expect { importer.import_folders_and_attachments(attachments_data) }
+ .not_to change(Decidim::Attachment, :count)
+ end
+ end
end
end
end
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
index 57ec9cb121f86..2577d2432fb03 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/assembly_serializer_spec.rb
@@ -22,7 +22,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
index 9d07c6c3d027c..baee2322438b5 100644
--- a/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
+++ b/decidim-assemblies/spec/serializers/decidim/assemblies/open_data_assembly_serializer_spec.rb
@@ -23,7 +23,6 @@ module Decidim::Assemblies
expect(serialized).to include(short_description: resource.short_description)
expect(serialized).to include(description: resource.description)
expect(serialized[:remote_hero_image_url]).to be_blob_url(resource.hero_image.blob)
- expect(serialized[:remote_banner_image_url]).to be_blob_url(resource.banner_image.blob)
expect(serialized).to include(promoted: resource.promoted)
expect(serialized).to include(developer_group: resource.developer_group)
expect(serialized).to include(meta_scope: resource.meta_scope)
diff --git a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
index c4a4409979ba0..c98bd31acad1e 100644
--- a/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
+++ b/decidim-assemblies/spec/shared/manage_assemblies_examples.rb
@@ -18,7 +18,7 @@
it "updates an assembly" do
fill_in_i18n(:assembly_title, "#assembly-title-tabs", **attributes[:title].except("machine_translations"))
- dynamically_attach_file(:assembly_banner_image, image3_path, remove_before: true)
+ dynamically_attach_file(:assembly_hero_image, image3_path, remove_before: true)
within ".edit_assembly" do
expect(assembly_parent_id_options).not_to include(assembly.id)
@@ -84,12 +84,6 @@
src = page.find("img")["src"]
expect(src).to be_blob_url(hero_blob)
end
-
- banner_blob = assembly.hero_image.blob
- within %([data-active-uploads] [data-filename="#{banner_blob.filename}"]) do
- src = page.find("img")["src"]
- expect(src).to be_blob_url(banner_blob)
- end
end
end
diff --git a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
index f365f2fb79242..8d59e9521f705 100644
--- a/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_imports_assembly_spec.rb
@@ -29,10 +29,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
stub_get_request_with_format(
"http://localhost:3000/uploads/decidim/attachment/file/31/Exampledocument.pdf",
"application/pdf"
@@ -115,10 +111,6 @@
.to_return(status: 404, body: "Not Found")
stub_request(:head, "http://example.com/missing-hero.jpg")
.to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city2.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
within_admin_menu do
click_on "Import"
@@ -149,115 +141,7 @@
end
end
- context "when banner image URL returns 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, body: File.read(Decidim::Dev.asset("city.jpeg")))
- stub_request(:head, "http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg")
- .to_return(status: 200, headers: { "Content-Type" => "image/jpeg" })
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 banner",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-banner"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows a warning about the missing banner image" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 banner")
-
- within ".flash.warning" do
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both hero and banner image URLs return 404" do
- let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
- let(:json_file) do
- Tempfile.new(["assemblies", ".json"]).tap do |file|
- file.write(json_data.to_json)
- file.rewind
- end
- end
- let(:uploaded_file) do
- Rack::Test::UploadedFile.new(json_file.path, "application/json")
- end
-
- before do
- json_data.first["remote_hero_image_url"] = "http://example.com/missing-hero.jpg"
- json_data.first["remote_banner_image_url"] = "http://example.com/missing-banner.jpg"
-
- stub_request(:get, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-hero.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:get, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, "http://example.com/missing-banner.jpg")
- .to_return(status: 404, body: "Not Found")
-
- within_admin_menu do
- click_on "Import"
- end
-
- within ".import_assembly" do
- fill_in_i18n(
- :assembly_title,
- "#assembly-title-tabs",
- en: "Import assembly with 404 images",
- es: "Importación de la asamblea",
- ca: "Importació de l'asamblea"
- )
- fill_in :assembly_slug, with: "as-import-404-both"
- end
-
- dynamically_attach_file(:assembly_document, uploaded_file.path)
- click_on "Import"
- end
-
- it "imports successfully and shows warnings for both missing images" do
- expect(page).to have_callout("Assembly successfully imported.")
- expect(page).to have_callout("Import assembly with 404 images")
-
- within ".flash.warning" do
- expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
- end
- end
- end
-
- context "when both image URLs are too long and return 404" do
+ context "when hero image URL is too long and returns 404" do
let(:json_data) { JSON.parse(File.read(Decidim::Dev.asset("assemblies.json"))) }
let(:json_file) do
Tempfile.new(["assemblies", ".json"]).tap do |file|
@@ -269,20 +153,14 @@
Rack::Test::UploadedFile.new(json_file.path, "application/json")
end
let(:hero_image_url) { "http://example.com/#{"a" * 5000}.jpg" }
- let(:banner_image_url) { "http://example.com/#{"b" * 5000}.jpg" }
before do
json_data.first["remote_hero_image_url"] = hero_image_url
- json_data.first["remote_banner_image_url"] = banner_image_url
stub_request(:get, hero_image_url)
.to_return(status: 404, body: "Not Found")
stub_request(:head, hero_image_url)
.to_return(status: 404, body: "Not Found")
- stub_request(:get, banner_image_url)
- .to_return(status: 404, body: "Not Found")
- stub_request(:head, banner_image_url)
- .to_return(status: 404, body: "Not Found")
within_admin_menu do
click_on "Import"
@@ -303,13 +181,12 @@
click_on "Import"
end
- it "imports successfully and shows warnings for both missing images" do
+ it "imports successfully and shows warnings for missing hero image" do
expect(page).to have_callout("Assembly successfully imported.")
expect(page).to have_callout("Import assembly with long 404 images")
within ".flash.warning" do
expect(page).to have_content(/The hero image could not be imported \(404 Not Found\)\./i)
- expect(page).to have_content(/The banner image could not be imported \(404 Not Found\)\./i)
end
end
end
@@ -338,10 +215,6 @@
"http://localhost:3000/uploads/decidim/assembly/hero_image/1/city.jpeg",
"image/jpeg"
)
- stub_get_request_with_format(
- "http://localhost:3000/uploads/decidim/assembly/banner_image/1/city2.jpeg",
- "image/jpeg"
- )
within_admin_menu do
click_on "Import"
diff --git a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
index 9e945e03285ca..e23ed6837013a 100644
--- a/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
+++ b/decidim-assemblies/spec/system/admin/admin_manages_assemblies_spec.rb
@@ -86,7 +86,6 @@
end
dynamically_attach_file(:assembly_hero_image, image1_path)
- dynamically_attach_file(:assembly_banner_image, image2_path)
within ".new_assembly" do
find("*[type=submit]").click
@@ -111,15 +110,11 @@
visit decidim_admin_assemblies.assemblies_path
end
- it "update a participatory process without images does not delete them" do
+ it "update an assembly without images does not delete them" do
within "tr", text: translated(assembly3.title) do
click_on translated(assembly3.title)
end
- within_admin_sidebar_menu do
- click_on "About this assembly"
- end
-
select(decidim_sanitize_translated(taxonomy.name), from: "taxonomies-#{taxonomy_filter.id}")
click_on "Update"
@@ -135,6 +130,18 @@
expect(src).to be_blob_url(hero_blob)
end
end
+
+ describe "when the assembly is transparent" do
+ let!(:assembly3) { create(:assembly, :private, :transparent, organization:) }
+
+ it "shows the transparent checkbox correctly" do
+ within "tr", text: translated(assembly3.title) do
+ click_on translated(assembly3.title)
+ end
+
+ expect(page).to have_checked_field("assembly_is_transparent")
+ end
+ end
end
context "when managing parent assemblies" do
@@ -195,4 +202,61 @@
end
end
end
+
+ context "when navigating grandchild assemblies (3rd level)" do
+ let!(:grandmother_assembly) { create(:assembly, organization:) }
+ let!(:mother_assembly) { create(:assembly, organization:, parent: grandmother_assembly) }
+ let!(:child_assembly) { create(:assembly, :with_content_blocks, organization:, parent: mother_assembly) }
+ let(:assembly) { child_assembly }
+
+ before do
+ switch_to_host(organization.host)
+ login_as user, scope: :user
+ visit decidim_admin_assemblies.assemblies_path
+ end
+
+ describe "listing grandchild assemblies" do
+ it "expands both parent and grandparent assemblies to show child" do
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+
+ # Opens mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-down]").click
+ end
+
+ expect(page).to have_content(translated(child_assembly.title))
+
+ # Opens actions dropdown in child
+ find("button[data-target='actions-assembly-#{child_assembly.id}']").click
+ expect(page).to have_content("Edit")
+ expect(page).to have_content("Share link")
+ expect(page).to have_content("Export")
+
+ # Collapse mother (2nd level)
+ within "tr", text: translated(mother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(child_assembly.title))
+ expect(page).to have_content(translated(mother_assembly.title))
+
+ # Collapse grandmother (1st level)
+ within "tr", text: translated(grandmother_assembly.title) do
+ find("a[data-arrow-up]").click
+ end
+
+ expect(page).to have_no_content(translated(mother_assembly.title))
+ expect(page).to have_no_content(translated(child_assembly.title))
+ end
+ end
+ end
end
diff --git a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
index a52d4aaefbcf5..1749135152554 100644
--- a/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
+++ b/decidim-assemblies/spec/system/assemblies_social_share_spec.rb
@@ -5,12 +5,11 @@
describe "Social shares" do
let(:organization) { create(:organization) }
- let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:, banner_image:) }
+ let(:assembly) { create(:assembly, organization:, description:, short_description:, hero_image:) }
let(:content_block) { create(:content_block, organization:, manifest_name: :hero, scope_name: :homepage) }
let!(:attachment) { create(:attachment, :with_image, attached_to: assembly, file: attachment_file) }
let(:description) { { en: "Description
" } }
let(:short_description) { { en: "Description
" } }
- let(:banner_image) { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
let(:hero_image) { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
let!(:attachment_file) { Decidim::Dev.test_file("city3.jpeg", "image/jpeg") }
let(:description_image_path) { Rails.application.routes.url_helpers.rails_blob_path(description_image, only_path: true) }
@@ -44,19 +43,11 @@
context "when no hero_image" do
let(:hero_image) { nil }
- it_behaves_like "a social share meta tag", "city.jpeg"
- end
-
- context "when no direct images" do
- let(:hero_image) { nil }
- let(:banner_image) { nil }
-
it_behaves_like "a social share meta tag", "city3.jpeg"
end
context "when no attachments nor direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
it_behaves_like "a social share meta tag", "description_image.jpg"
@@ -70,7 +61,6 @@
context "when no attachments, description image or direct images" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
@@ -80,7 +70,6 @@
context "when nothing" do
let(:hero_image) { nil }
- let(:banner_image) { nil }
let(:attachment) { nil }
let(:description_image_path) { "" }
let(:short_description_image_path) { "" }
diff --git a/decidim-assemblies/spec/types/assembly_type_spec.rb b/decidim-assemblies/spec/types/assembly_type_spec.rb
index a59648ec90844..c197eb01dd68c 100644
--- a/decidim-assemblies/spec/types/assembly_type_spec.rb
+++ b/decidim-assemblies/spec/types/assembly_type_spec.rb
@@ -83,14 +83,6 @@ module Assemblies
end
end
- describe "bannerImage" do
- let(:query) { "{ bannerImage }" }
-
- it "returns the banner image field" do
- expect(response["bannerImage"]).to be_blob_url(model.banner_image.blob)
- end
- end
-
describe "promoted" do
let(:query) { "{ promoted }" }
diff --git a/decidim-assemblies/spec/types/integration_schema_spec.rb b/decidim-assemblies/spec/types/integration_schema_spec.rb
index 506a9bf3b697c..fdedb5a24c0fb 100644
--- a/decidim-assemblies/spec/types/integration_schema_spec.rb
+++ b/decidim-assemblies/spec/types/integration_schema_spec.rb
@@ -77,7 +77,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -200,7 +199,6 @@
it "returns the correct response" do
data = response["assemblies"].first
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
@@ -231,7 +229,6 @@
translation(locale:"#{locale}")
}
}
- bannerImage
categories {
id
}
@@ -344,7 +341,6 @@
it "returns the correct response" do
data = response["assembly"]
expect(data).to include(assembly_data)
- expect(data["bannerImage"]).to be_blob_url(assembly.banner_image.blob)
expect(data["heroImage"]).to be_blob_url(assembly.hero_image.blob)
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
index dea863457fd7f..0af90d0f23945 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/admin/posts_controller.rb
@@ -26,7 +26,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +48,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
index aeffda5c91004..3a7aecce62871 100644
--- a/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
+++ b/decidim-blogs/app/controllers/decidim/blogs/posts_controller.rb
@@ -36,7 +36,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("posts.create.invalid", scope: "decidim.blogs.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -58,7 +58,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("posts.update.invalid", scope: "decidim.blogs.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
@@ -97,11 +97,8 @@ def posts
end
end
- # PROVISIONAL if we implement counter cache
def posts_most_commented
- @posts_most_commented ||= posts.joins(:comments).group(:id)
- .select("count(decidim_comments_comments.id) as counter")
- .select("decidim_blogs_posts.*").order("counter DESC").published_at_desc.limit(7)
+ @posts_most_commented ||= posts.order(comments_count: :desc).published_at_desc.limit(7)
end
def add_breadcrumb_item
diff --git a/decidim-blogs/app/models/decidim/blogs/post.rb b/decidim-blogs/app/models/decidim/blogs/post.rb
index 38c74550bb540..c1c1801729431 100644
--- a/decidim-blogs/app/models/decidim/blogs/post.rb
+++ b/decidim-blogs/app/models/decidim/blogs/post.rb
@@ -38,7 +38,7 @@ class Post < Blogs::ApplicationRecord
D: :body,
datetime: :created_at
},
- index_on_create: true,
+ index_on_create: ->(post) { post.visible? },
index_on_update: ->(post) { post.visible? })
class << self
diff --git a/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
new file mode 100644
index 0000000000000..322bc8361847d
--- /dev/null
+++ b/decidim-blogs/spec/system/admin_manages_component_publication_spec.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Admin manages component publication" do
+ include_context "when managing a component as an admin" do
+ let!(:resource) { create(:post, :published, component:) }
+
+ context "when cycling through publication states" do
+ let!(:component) { create(:post_component, participatory_space:) }
+
+ include_examples "cycling through publication states"
+ end
+
+ context "when component is unpublished, and admin publishes" do
+ let!(:component) { create(:post_component, :unpublished, participatory_space:) }
+
+ include_examples "add component resources to search index"
+ end
+
+ context "when component is published, and admin unpublishes" do
+ let!(:component) { create(:post_component, :published, participatory_space:) }
+
+ include_examples "removes component resources from search index"
+ end
+ end
+end
diff --git a/decidim-blogs/spec/system/admin_publishes_component_spec.rb b/decidim-blogs/spec/system/admin_publishes_component_spec.rb
deleted file mode 100644
index 734951b434d63..0000000000000
--- a/decidim-blogs/spec/system/admin_publishes_component_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-describe "Admin publishes component" do
- let(:manifest_name) { "blogs" }
- let!(:resource) { create(:post, component:) }
-
- include_context "when publishing and unpublishing the component"
- include_context "when cycling through publication states"
-end
diff --git a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
index e5f196d91df65..5167807fcb88a 100644
--- a/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
+++ b/decidim-budgets/app/cells/decidim/budgets/budgets_list_cell.rb
@@ -35,7 +35,8 @@ def progress_budgets
end
def non_voted_budgets
- budgets.where.not(id: voted.map(&:id))
+ budgets_to_exclude = progress_budgets + voted
+ budgets.where.not(id: budgets_to_exclude.map(&:id))
end
def highlighted?
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
index 66e06267db52b..bd80489593723 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/create_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class CreateProject < Decidim::Commands::CreateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
private
diff --git a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
index 3cd42cd6d0652..522afcf3e0697 100644
--- a/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
+++ b/decidim-budgets/app/commands/decidim/budgets/admin/update_project.rb
@@ -7,6 +7,7 @@ module Admin
# panel.
class UpdateProject < Decidim::Commands::UpdateResource
include ::Decidim::GalleryMethods
+
fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
def initialize(form, project)
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
index 41dc4fcfe8b1b..a2f334d877695 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/budgets_controller.rb
@@ -6,6 +6,7 @@ module Admin
# This controller allows the create or update a budget.
class BudgetsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
+
helper_method :budgets, :budget, :finished_orders, :pending_orders,
:users_with_pending_orders, :users_with_finished_orders
@@ -26,7 +27,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -48,7 +49,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
index 7eb5bd00861e6..e45f48995522a 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Admin::ApplicationController
include Decidim::Admin::HasTrashableResources
include Decidim::Admin::ComponentTaxonomiesHelper
include Decidim::Budgets::Admin::Filterable
+
helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
helper Decidim::Budgets::ProjectsHelper
@@ -39,7 +40,7 @@ def create
on(:invalid) do
flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
@@ -62,7 +63,7 @@ def update
on(:invalid) do
flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
- render action: "edit", status: :unprocessable_entity
+ render action: "edit", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
index 22d03155470d7..a60f8ebcf6a9e 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/admin/proposals_imports_controller.rb
@@ -24,7 +24,7 @@ def create
on(:invalid) do
flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
- render action: "new", status: :unprocessable_entity
+ render action: "new", status: :unprocessable_content
end
end
end
diff --git a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
index 8b4b94a8342bb..dca3242383a8f 100644
--- a/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
+++ b/decidim-budgets/app/controllers/decidim/budgets/line_items_controller.rb
@@ -22,12 +22,12 @@ def create
AddLineItem.call(persisted_current_order, project, current_user) do
on(:ok) do |order|
self.current_order = order
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
@@ -38,12 +38,12 @@ def destroy
respond_to do |format|
RemoveLineItem.call(current_order, project) do
on(:ok) do |_order|
- format.html { redirect_back(fallback_location: budget_path(budget)) }
+ format.html { redirect_back_or_to(budget_path(budget)) }
format.js { render "update_budget" }
end
on(:invalid) do
- format.js { render "update_budget", status: :unprocessable_entity }
+ format.js { render "update_budget", status: :unprocessable_content }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
index 4918e044c4329..eb4b8f4425d82 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/budget_form.rb
@@ -16,7 +16,7 @@ class BudgetForm < Decidim::Form
validates :title, translatable_presence: true
validates :weight, numericality: { greater_than_or_equal_to: 0 }
- validates :total_budget, numericality: { greater_than: 0 }
+ validates :total_budget, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
end
end
end
diff --git a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
index 339ab98e8968f..530e4099dac94 100644
--- a/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
+++ b/decidim-budgets/app/forms/decidim/budgets/admin/project_form.rb
@@ -26,7 +26,7 @@ class ProjectForm < Decidim::Form
validates :title, translatable_presence: true
validates :description, translatable_presence: true
- validates :budget_amount, presence: true, numericality: { greater_than: 0 }
+ validates :budget_amount, presence: true, numericality: { only_integer: true, greater_than: 0, less_than_or_equal_to: 9_223_372_036_854_775_807 }
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? }
validate :notify_missing_attachment_if_errored
diff --git a/decidim-budgets/app/models/decidim/budgets/project.rb b/decidim-budgets/app/models/decidim/budgets/project.rb
index 9990eab6dddcb..e5dcb4b0015a9 100644
--- a/decidim-budgets/app/models/decidim/budgets/project.rb
+++ b/decidim-budgets/app/models/decidim/budgets/project.rb
@@ -134,14 +134,14 @@ def attachment_context
end
ransacker :confirmed_orders_count do
- query = <<-SQL.squish
- (
- SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
- FROM decidim_budgets_line_items
- LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
- WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
- AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
- )
+ query = <<~SQL.squish
+ (
+ SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+ FROM decidim_budgets_line_items
+ LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+ WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+ AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+ )
SQL
Arel.sql(query)
end
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
index 70bf4c4dc4a39..b16297b1722a6 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/edit.html.erb
@@ -1,7 +1,8 @@
-<% add_decidim_page_title("#{translated_attribute(budget.title)} - #{t(".title")}") %>
+<% add_decidim_page_title(t(".title", budget: decidim_sanitize_translated(budget.title))) %>
+
- <%= "#{decidim_escape_translated(budget.title)} #{t(".title")}" %>
+ <%= t(".title", budget: decidim_sanitize_translated(budget.title)) %>
diff --git a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
index ad4cef7763585..7c2f6e7f77309 100644
--- a/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
+++ b/decidim-budgets/app/views/decidim/budgets/admin/projects/index.html.erb
@@ -3,7 +3,7 @@
+ <% if has_replies_in_children? %>
+ <%= render :replies %>
+ <% elsif can_reply? %>
+
+ <% end %>
<% end %>
<% if current_user.present? %>
<%= cell("decidim/report_button", model, modal_id: "flagModalComment#{model.id}").flag_modal %>
diff --git a/decidim-comments/app/cells/decidim/comments/comment_cell.rb b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
index 4e0c60d16d97c..3c792e8a940b6 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_cell.rb
+++ b/decidim-comments/app/cells/decidim/comments/comment_cell.rb
@@ -86,10 +86,6 @@ def comment_body
formatted_body
end
- def replies
- SortedComments.for(model, order_by: order)
- end
-
def order
options[:order] || "older"
end
@@ -234,7 +230,11 @@ def has_replies?
end
def has_replies_in_children?
- model.descendants.where(decidim_commentable_type: "Decidim::Comments::Comment").not_hidden.not_deleted.exists?
+ replies_count.positive?
+ end
+
+ def replies_count
+ @replies_count ||= model.replies.count
end
# action_authorization_button expects current_component to be available
diff --git a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
index 9670e0ca5ee7c..78bbcedd57d47 100644
--- a/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
+++ b/decidim-comments/app/cells/decidim/comments/comment_form/show.erb
@@ -31,7 +31,7 @@
<% end %>
">
- <%= t("components.manage_trash.title", scope: "decidim.admin") %> + <%= t(".title") %>
-
Transfer User
+ <%= t(".title") %>