decidim-assemblies 0.31.8 → 0.32.0.rc1

data/app/packs/src/decidim/assemblies/controllers/assembly_admin/assembly_admin.test.js

@@ -363,7 +363,6 @@ describe("AssemblyAdminController", () => {
                       <div aria-disabled="false" aria-label="Choose date" class="wc-datepicker sc-wc-datepicker" role="group">
                       </div>
                     </wc-datepicker>
-                    <button class="datepicker__pick-calendar button button__secondary button__xs" disabled="true" type="button">Select</button>
                     <button class="datepicker__close-calendar button button__transparent-secondary button__xs" type="button">Close</button>
                   </div>
                 </div>
@@ -388,7 +387,6 @@ describe("AssemblyAdminController", () => {
                   <div class="datepicker__container" style="display: none;">
                     <wc-datepicker id="assembly_included_at_date_datepicker" locale="en" class="sc-wc-datepicker-h sc-wc-datepicker-s hydrated">
                     </wc-datepicker>
-                    <button class="datepicker__pick-calendar button button__secondary button__xs" disabled="true" type="button">Select</button>
                     <button class="datepicker__close-calendar button button__transparent-secondary button__xs" type="button">Close</button>
                   </div>
                 </div>
@@ -411,7 +409,6 @@ describe("AssemblyAdminController", () => {
                     </svg>
                   </button>
                   <div class="datepicker__container" style="display: none;">
-                    <button class="datepicker__pick-calendar button button__secondary button__xs" disabled="true" type="button">Select</button>
                     <button class="datepicker__close-calendar button button__transparent-secondary button__xs" type="button">Close</button>
                   </div>
                 </div>
@@ -433,7 +430,6 @@ describe("AssemblyAdminController", () => {
                     </svg>
                   </button>
                   <div class="datepicker__container" style="display: none;">
-                    <button class="datepicker__pick-calendar button button__secondary button__xs" disabled="true" type="button">Select</button>
                     <button class="datepicker__close-calendar button button__transparent-secondary button__xs" type="button">Close</button>
                   </div>
                 </div>
@@ -494,15 +490,6 @@ describe("AssemblyAdminController", () => {
                   <button id="assembly_hero_image_button" name="hero_image" class="button button__sm button__transparent-secondary" type="button" data-dialog-open="upload_c5515a82-b6d4-4c1c-a957-013c9679b956" data-upload="{&quot;addAttribute&quot;:&quot;hero_image&quot;,&quot;resourceName&quot;:&quot;assembly&quot;,&quot;resourceClass&quot;:&quot;Decidim::Assembly&quot;,&quot;required&quot;:false,&quot;maxFileSize&quot;:10485760.0,&quot;multiple&quot;:false,&quot;titled&quot;:false,&quot;formObjectClass&quot;:&quot;Decidim::Assemblies::Admin::AssemblyForm&quot;}" aria-haspopup="dialog">Add image</button>
                 </div>
               </div>
-              <div class="columns">
-                <div class="upload-modal__files-container upload-container-for-banner_image ">
-                  <div>
-                    <label>Banner image</label>
-                    <div class="upload-modal__files" data-active-uploads="upload_0d6b6c3f-3681-450e-dummy-2"></div>
-                  </div>
-                  <button id="assembly_banner_image_button" name="banner_image" class="button button__sm button__transparent-secondary" type="button" data-dialog-open="upload_0d6b6c3f-3681-450e-dummy-2" data-upload="{&quot;addAttribute&quot;:&quot;banner_image&quot;,&quot;resourceName&quot;:&quot;assembly&quot;,&quot;resourceClass&quot;:&quot;Decidim::Assembly&quot;,&quot;required&quot;:false,&quot;maxFileSize&quot;:10485760.0,&quot;multiple&quot;:false,&quot;titled&quot;:false,&quot;formObjectClass&quot;:&quot;Decidim::Assemblies::Admin::AssemblyForm&quot;}" aria-haspopup="dialog">Add image</button>
-                </div>
-              </div>
             </div>
           </div>
         </div>
@@ -748,7 +735,7 @@ describe("AssemblyAdminController", () => {
               <label for="assembly_private_space">
                 <input name="assembly[private_space]" type="hidden" value="0" autocomplete="off">
                 <input type="checkbox" value="1" name="assembly[private_space]" id="assembly_private_space">Private space </label>
-              <p class="help-text">You will be able to manage private participants after setting it as private</p>
+              <p class="help-text">You will be able to manage members after setting it as private</p>
             </div>
             <div class="row column" id="is_transparent">
               <label for="assembly_is_transparent">
@@ -870,28 +857,6 @@ describe("AssemblyAdminController", () => {
     it("should initialize the controller and set up event listeners", () => {
       expect(controller).toBeDefined();
       expect(element).toBeDefined();
-
-      // Test that initial state is set correctly
-      const isTransparentCheckbox = element.querySelector("#is_transparent input[type='checkbox']");
-      const specialFeatures = element.querySelector("#special_features");
-
-      expect(isTransparentCheckbox.disabled).toBe(true);
-      expect(specialFeatures.style.display).toBe("none");
-    });
-
-    it("should call assignBehavior for assembly_type and created_by fields", () => {
-      const assemblyType = element.querySelector("#assembly_assembly_type");
-      const createdBy = element.querySelector("#assembly_created_by");
-
-      expect(assemblyType).toBeDefined();
-      expect(createdBy).toBeDefined();
-
-      // Verify that event listeners are attached by triggering changes
-      // const assemblyTypeOther = element.querySelector("#assembly_type_other");
-      const createdByOther = element.querySelector("#created_by_other");
-
-      // expect(assemblyTypeOther.style.display).toBe("none");
-      expect(createdByOther.style.display).toBe("none");
     });
   });
 
@@ -931,16 +896,6 @@ describe("AssemblyAdminController", () => {
       // Should hide initially if value is not "others"
       expect(targetDiv.style.display).toBe("none");
     });
-
-    it("should handle null elements gracefully", () => {
-      expect(() => {
-        controller.attachVisibility(null, null);
-      }).not.toThrow();
-
-      expect(() => {
-        controller.attachVisibility(element.querySelector("#assembly_assembly_type"), null);
-      }).not.toThrow();
-    });
   });
 
   describe("toggleDependsOnSelect", () => {
@@ -963,79 +918,6 @@ describe("AssemblyAdminController", () => {
 
       expect(targetDiv.style.display).toBe("none");
     });
-
-    it("should return early if target or showDiv is null", () => {
-      const select = element.querySelector("#assembly_assembly_type");
-
-      expect(() => {
-        controller.toggleDependsOnSelect(null, null);
-      }).not.toThrow();
-
-      expect(() => {
-        controller.toggleDependsOnSelect(select, null);
-      }).not.toThrow();
-    });
-  });
-
-  describe("toggleDisabledHiddenFields", () => {
-    it("should initially disable transparent checkbox and hide special features", () => {
-      controller.toggleDisabledHiddenFields();
-
-      const isTransparentCheckbox = element.querySelector("#is_transparent input[type='checkbox']");
-      const specialFeatures = element.querySelector("#special_features");
-
-      expect(isTransparentCheckbox.disabled).toBe(true);
-      expect(specialFeatures.style.display).toBe("none");
-    });
-
-    it("should enable transparent checkbox and show special features when private space is checked", () => {
-      const privateSpaceCheckbox = element.querySelector("#private_space input[type='checkbox']");
-      const isTransparentCheckbox = element.querySelector("#is_transparent input[type='checkbox']");
-      const specialFeatures = element.querySelector("#special_features");
-
-      // Check private space checkbox
-      privateSpaceCheckbox.checked = true;
-
-      controller.toggleDisabledHiddenFields();
-
-      expect(isTransparentCheckbox.disabled).toBe(false);
-      expect(specialFeatures.style.display).toBe("block");
-    });
-
-    it("should disable transparent checkbox and hide special features when private space is unchecked", () => {
-      const privateSpaceCheckbox = element.querySelector("#private_space input[type='checkbox']");
-      const isTransparentCheckbox = element.querySelector("#is_transparent input[type='checkbox']");
-      const specialFeatures = element.querySelector("#special_features");
-
-      // Uncheck private space checkbox
-      privateSpaceCheckbox.checked = false;
-
-      controller.toggleDisabledHiddenFields();
-
-      expect(isTransparentCheckbox.disabled).toBe(true);
-      expect(specialFeatures.style.display).toBe("none");
-    });
-
-    it("should handle missing elements gracefully", () => {
-      // Remove elements to test graceful handling
-      element.querySelector("#private_space").remove();
-      element.querySelector("#is_transparent").remove();
-      element.querySelector("#special_features").remove();
-
-      expect(() => {
-        controller.toggleDisabledHiddenFields();
-      }).not.toThrow();
-    });
-
-    it("should handle missing checkbox inside transparent div", () => {
-      // Remove checkbox from transparent div
-      const isTransparent = element.querySelector("#is_transparent");
-      isTransparent.innerHTML = "";
-
-      expect(() => {
-        controller.toggleDisabledHiddenFields();
-      }).not.toThrow();
-    });
   });
 
   describe("integration tests", () => {
@@ -1063,15 +945,4 @@ describe("AssemblyAdminController", () => {
     });
   });
 
-  describe("edge cases", () => {
-    it("should handle elements with no checkbox inside", () => {
-      // Replace private space with div that has no checkbox
-      const privateSpace = element.querySelector("#private_space");
-      privateSpace.innerHTML = "<div>No checkbox here</div>";
-
-      expect(() => {
-        controller.toggleDisabledHiddenFields();
-      }).not.toThrow();
-    });
-  });
 });

data/app/packs/src/decidim/assemblies/controllers/assembly_admin/controller.js

@@ -2,14 +2,6 @@ import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
   connect() {
-    const privateSpace = this.element.querySelector("#private_space");
-
-    if (privateSpace) {
-      privateSpace.addEventListener("change", this.toggleDisabledHiddenFields);
-    }
-    this.toggleDisabledHiddenFields();
-
-    this.assignBehavior("assembly_type");
     this.assignBehavior("created_by");
   }
 
@@ -39,24 +31,4 @@ export default class extends Controller {
       showDiv.style.display = "block";
     }
   }
-
-  toggleDisabledHiddenFields() {
-    const privateSpace = document.getElementById("private_space");
-    const isTransparent = document.getElementById("is_transparent");
-    const specialFeatures = document.getElementById("special_features");
-
-    const enabledPrivateSpace = privateSpace?.querySelector("input[type='checkbox']")?.checked;
-    const isTransparentCheckbox = isTransparent?.querySelector("input[type='checkbox']");
-
-    if (isTransparentCheckbox) {
-      isTransparentCheckbox.disabled = (enabledPrivateSpace === false);
-    }
-
-    if (specialFeatures) {
-      specialFeatures.style.display = enabledPrivateSpace
-        ? "block"
-        : "none";
-    }
-  }
-
 }

data/app/permissions/decidim/assemblies/permissions.rb

@@ -41,7 +41,7 @@ module Decidim
 
         return permission_action unless assembly
 
-        user_can_read_private_users?
+        user_can_read_members?
 
         moderator_action?
         collaborator_action?
@@ -53,9 +53,9 @@ module Decidim
 
       private
 
-      def user_can_read_private_users?
-        return unless permission_action.subject == :space_private_user
-        return unless assembly.private_space?
+      def user_can_read_members?
+        return unless permission_action.subject == :space_member
+        return unless assembly.has_members?
 
         toggle_allow(user.admin? || can_manage_assembly?(role: :admin) || can_manage_assembly?(role: :collaborator))
       end
@@ -108,7 +108,7 @@ module Decidim
                       [:assembly, :participatory_space].include?(permission_action.subject) &&
                       assembly
 
-        return disallow! unless can_view_private_space?
+        return disallow! unless can_view_restricted_space?
         return allow! if user&.admin?
         return allow! if assembly.published?
         return allow! if user_can_preview_space?
@@ -116,11 +116,11 @@ module Decidim
         toggle_allow(can_manage_assembly?)
       end
 
-      def can_view_private_space?
-        return true unless assembly.private_space && !assembly.is_transparent?
+      def can_view_restricted_space?
+        return true unless assembly.restricted?
         return false unless user
 
-        user.admin || assembly.users.include?(user)
+        user.admin? || assembly.users.include?(user)
       end
 
       def public_list_members_action?
@@ -222,7 +222,7 @@ module Decidim
       # Collaborators can read/preview everything inside their assembly.
       def collaborator_action?
         return unless can_manage_assembly?(role: :collaborator)
-        return if permission_action.subject == :space_private_user
+        return if permission_action.subject == :space_member
 
         allow! if permission_action.action == :read || permission_action.action == :preview
       end

data/app/presenters/decidim/assemblies/admin_log/assembly_presenter.rb

@@ -35,7 +35,6 @@ module Decidim
             target: :i18n,
             title: :i18n,
             purpose_of_action: :i18n,
-            decidim_assemblies_type_id: :assembly_type,
             creation_date: :date,
             created_by: :string,
             created_by_other: :i18n,
@@ -44,7 +43,7 @@ module Decidim
             closing_date: :date,
             closing_date_reason: :i18n,
             internal_organisation: :i18n,
-            is_transparent: :boolean,
+            access_mode: :access_mode,
             special_features: :i18n,
             twitter_handler: :string,
             facebook_handler: :string,

data/app/presenters/decidim/assemblies/assembly_presenter.rb

@@ -9,10 +9,6 @@ module Decidim
         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?
 

data/app/queries/decidim/assemblies/admin/admin_users.rb

@@ -42,7 +42,7 @@ module Decidim
         def assemblies_user_admins
           Decidim::User.where(
             id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
-                                         .select(:decidim_user_id)
+                .select(:decidim_user_id)
           )
         end
 

data/app/serializers/decidim/assemblies/assembly_importer.rb

@@ -38,7 +38,6 @@ module Decidim
             target: attributes["target"],
             participatory_scope: attributes["participatory_scope"],
             participatory_structure: attributes["participatory_structure"],
-            private_space: attributes["private_space"],
             reference: attributes["reference"],
             purpose_of_action: attributes["purpose_of_action"],
             composition: attributes["composition"],
@@ -49,7 +48,6 @@ module Decidim
             closing_date: attributes["closing_date"],
             created_by_other: attributes["created_by_other"],
             internal_organisation: attributes["internal_organisation"],
-            is_transparent: attributes["is_transparent"],
             special_features: attributes["special_features"],
             twitter_handler: attributes["twitter_handler"],
             instagram_handler: attributes["instagram_handler"],
@@ -58,11 +56,9 @@ module Decidim
             github_handler: attributes["github_handler"],
             created_by: attributes["created_by"],
             meta_scope: attributes["meta_scope"],
-            announcement: attributes["announcement"]
+            access_mode: resolve_access_mode(attributes)
           )
           import_hero_image(attributes["remote_hero_image_url"])
-          import_banner_image(attributes["remote_banner_image_url"])
-
           @imported_assembly.save!
           @imported_assembly
         end
@@ -109,8 +105,8 @@ module Decidim
           end
         end
 
-        if attachments["attachment_collections"].present?
-          attachments["attachment_collections"]&.map do |collection|
+        unless attachments["attachment_collections"].empty?
+          attachments["attachment_collections"].map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end
@@ -178,14 +174,6 @@ module Decidim
         @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)
 
@@ -197,6 +185,15 @@ module Decidim
         message = message.presence || error.message
         "#{code} #{message}"
       end
+
+      def resolve_access_mode(attributes)
+        return attributes["access_mode"] if attributes["access_mode"].present?
+
+        return "transparent" if attributes["is_transparent"] == true
+        return "restricted" if attributes["private_space"] == true
+
+        "open"
+      end
     end
   end
 end

data/app/serializers/decidim/assemblies/assembly_serializer.rb

@@ -14,7 +14,7 @@ module Decidim
               attachment_collections: serialize_attachment_collections,
               files: serialize_attachments
             },
-            private_space: resource.private_space,
+            access_mode: resource.access_mode,
             weight: resource.weight,
             components: serialize_components
           }

data/app/serializers/decidim/assemblies/open_data_assembly_serializer.rb

@@ -12,8 +12,6 @@ module Decidim
             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,
-            announcement: resource.announcement,
             developer_group: resource.developer_group,
             local_area: resource.local_area,
             meta_scope: resource.meta_scope,
@@ -39,18 +37,14 @@ module Decidim
             creation_date: resource.creation_date,
             closing_date_reason: resource.closing_date_reason,
             internal_organisation: resource.internal_organisation,
-            is_transparent: resource.is_transparent,
+            access_mode: resource.access_mode,
             special_features: resource.special_features,
             twitter_handler: resource.twitter_handler,
             instagram_handler: resource.instagram_handler,
             facebook_handler: resource.facebook_handler,
             youtube_handler: resource.youtube_handler,
             github_handler: resource.github_handler,
-            created_by_other: resource.created_by_other,
-            assembly_type: {
-              id: resource.assembly_type.try(:id),
-              title: resource.assembly_type.try(:title) || empty_translatable
-            }
+            created_by_other: resource.created_by_other
           }
         )
       end

data/app/views/decidim/assemblies/admin/assemblies/_assemblies_thead.html.erb

@@ -7,7 +7,7 @@
     <%= sort_link(query, :created_at, t("models.assembly.fields.created_at", scope: "decidim.admin"), default_order: :desc) %>
   </th>
   <th>
-    <%= sort_link(query, :private_space, t("models.assembly.fields.private", scope: "decidim.admin")) %>
+    <%= sort_link(query, :access_mode, t("models.assembly.fields.access_mode", scope: "decidim.admin")) %>
   </th>
   <th class="table-list__actions">
     <%= sort_link(query, :published_at, t("models.assembly.fields.published", scope: "decidim.admin")) %>

data/app/views/decidim/assemblies/admin/assemblies/_assembly_row.html.erb

@@ -33,12 +33,11 @@
   <td class="table-list__date" data-label="<%= t("models.assembly.fields.created_at", scope: "decidim.admin") %>">
     <%= l(assembly.created_at, format: :short) %>
   </td>
-  <td class="table-list__state" data-label="<%= t("models.assembly.fields.private", scope: "decidim.admin") %>">
-    <% if assembly.private_space? %>
-      <span><%= t("assemblies.index.private", scope: "decidim.admin") %></span>
-    <% else %>
-      <span><%= t("assemblies.index.public", scope: "decidim.admin") %></span>
-    <% end %>
+  <td class="table-list__state" data-label="<%= t("models.assembly.fields.access_mode", scope: "decidim.admin") %>">
+    <%# i18n-tasks-use t("decidim.admin.assemblies.index.access_modes.open") %>
+    <%# i18n-tasks-use t("decidim.admin.assemblies.index.access_modes.restricted") %>
+    <%# i18n-tasks-use t("decidim.admin.assemblies.index.access_modes.transparent") %>
+    <span><%= t(assembly.access_mode, scope: "decidim.admin.assemblies.index.access_modes") %></span>
   </td>
   <td class="table-list__state" data-label="<%= t("models.assembly.fields.published", scope: "decidim.admin") %>">
     <% if assembly.published? %>
@@ -146,7 +145,7 @@
             <% if assembly.published? %>
               <li class="dropdown__item">
                 <div class="dropdown__button-disabled">
-                  <%= with_tooltip t("tooltips.deleted_assemblies_info", scope: "decidim.admin"), class: :left do %>
+                  <%= with_tooltip t("tooltips.deleted_assemblies_info", scope: "decidim.admin") do %>
                     <%= icon "delete-bin-line", class: "text-gray" %>
                     <span>
                       <%= t("actions.soft_delete", scope: "decidim.admin") %>

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -48,9 +48,6 @@
         <%= form.translated :editor, :internal_organisation, aria: { label: :internal_organisation } %>
       </div>
 
-      <div class="row column">
-        <%= form.translated :editor, :announcement, help_text: t(".announcement_help") %>
-      </div>
     </div>
   </div>
   <div class="card" data-controller="accordion" id="accordion-duration">
@@ -101,10 +98,6 @@
         <div class="columns">
           <%= form.upload :hero_image, button_class: "button button__sm button__transparent-secondary" %>
         </div>
-
-        <div class="columns">
-          <%= form.upload :banner_image, button_class: "button button__sm button__transparent-secondary" %>
-        </div>
       </div>
     </div>
   </div>
@@ -176,6 +169,39 @@
     </div>
   </div>
 
+  <div class="card" data-controller="accordion access-mode" id="accordion-access">
+    <div class="card-divider">
+      <button class="card-divider-button" data-open="true" data-controls="panel-access" type="button">
+        <%= icon "arrow-right-s-line" %>
+        <h2 class="card-title" id="access">
+          <%= t("label", scope: "decidim.assemblies.admin.assemblies.form.access") %>
+        </h2>
+      </button>
+    </div>
+    <div id="panel-access" class="card-section">
+      <div class="row column" id="has_members">
+        <%= form.check_box :has_members, help_text: t(".has_members_help") %>
+      </div>
+
+      <fieldset class="row column" id="access_mode">
+        <legend>
+          <%= t("access.set_this_space_as", scope: "decidim.assemblies.admin.assemblies.form") %>
+        </legend>
+        <div class="radio-group">
+          <%# i18n-tasks-use t("decidim.assemblies.admin.assemblies.form.access.options.open") %>
+          <%# i18n-tasks-use t("decidim.assemblies.admin.assemblies.form.access.options.restricted") %>
+          <%# i18n-tasks-use t("decidim.assemblies.admin.assemblies.form.access.options.transparent") %>
+          <% Decidim::Assembly::ACCESS_MODES.keys.each do |mode| %>
+            <%= label_tag nil, class: "form__wrapper-checkbox-label" do %>
+              <%= form.radio_button :access_mode, mode %>
+              <span><%= t(mode, scope: "decidim.assemblies.admin.assemblies.form.access.options") %></span>
+             <% end %>
+          <% end %>
+        </div>
+      </fieldset>
+    </div>
+  </div>
+
   <div class="card" data-controller="accordion" id="accordion-visibility">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-visibility" type="button">
@@ -185,7 +211,6 @@
         </h2>
       </button>
     </div>
-
     <div id="panel-visibility" class="card-section">
       <% if params[:parent_id].present? %>
         <%= form.hidden_field :parent_id, value: @form.parent_id %>
@@ -200,15 +225,6 @@
       <div class="row column">
         <%= form.check_box :promoted %>
       </div>
-
-      <div class="row column" id="private_space">
-        <%= form.check_box :private_space %>
-        <p class="help-text"><%= t(".private_notice") %></p>
-      </div>
-
-      <div class="row column" id="is_transparent">
-        <%= form.check_box :is_transparent %>
-      </div>
     </div>
   </div>
 

data/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")) %>
+
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/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")) %>
+
 <div class="card" id="assemblies">
 
   <% if parent_assembly && parent_assembly.self_and_ancestors.length %>

data/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")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t "assemblies.manage_trash.title", scope: "decidim.admin" %>
+    <%= t(".title") %>
   </h1>
 </div>
 <div class="card" id="assemblies">

data/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")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t "assemblies.new.title", scope: "decidim.admin" %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/app/views/decidim/assemblies/admin/assembly_duplicates/_form.html.erb

@@ -17,6 +17,9 @@
             <div class="columns">
               <%= form.check_box :duplicate_components %>
             </div>
+            <div class="columns">
+              <%= form.check_box :duplicate_landing_page_blocks %>
+            </div>
           </div>
         </div>
       </div>

data/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")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_duplicates.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/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")) %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_imports.new.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 

data/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")) %>
 <div class="item_show__header">
   <h1 class="item_show__header-title">
-    <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
+    <%= t(".title") %>
   </h1>
 </div>
 <div class="item__edit item__edit-1col">