decidim-assemblies 0.28.0 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c359b084dbe68067234aae2bb0238697cfa0a0f5eb584270ad1dde8ba998c8
-  data.tar.gz: 4a6ecce10d1e80a1ef322b0482da2322b3601cd6f938f281497b68acf09acc8e
+  metadata.gz: 3a1ae2d903911c628f9146ed6850fc6cd37f1d52d296f500932d34a2de8b478d
+  data.tar.gz: 600f5ebffd12cdb3f3334c8e337b25f659ef0ea3903c5907e901712224a57a78
 SHA512:
-  metadata.gz: dff60d73781c334eab505f5b09262ec0f90078a95fb6abe7deb9de7450200b20733e16bca72081cc671861f8867309affc7185506f4c802b718e3f6dba6215ec
-  data.tar.gz: 57bcd39df23ce28d7866b58c32e964f3dd7a14338309bf0fe815e6c18c4cfb56d05737ab1ad8a55b75c2854948f14f94b9fe6d880bb27230e8882aab70625762
+  metadata.gz: a452f607f54719f6d117bb3d311a9422f68827f0301e9d251b9043b75f5ab66a7e2b775f585f21055fa93e8162504c23d1787aae5d3d329953024fb471232009
+  data.tar.gz: 0f8bb075b60be965273089b9eca17c115cac5bb1d82cb7fcb575f68bc4b449a7e0f1a9091084d76e3bf7c081700ec0b0a3dbded0b681abbbbbe1583d02fa2d33

data/app/cells/decidim/assemblies/content_blocks/dates_metadata_cell.rb

@@ -11,7 +11,7 @@ module Decidim
         end
 
         def space_presenter
-          AssemblyPresenter
+          Decidim::Assemblies::AssemblyPresenter
         end
 
         def translations_scope

data/app/cells/decidim/assemblies/content_blocks/extra_data_cell.rb

@@ -13,7 +13,7 @@ module Decidim
         end
 
         def presented_resource
-          AssemblyPresenter.new(resource)
+          Decidim::Assemblies::AssemblyPresenter.new(resource)
         end
 
         def type_item
@@ -22,7 +22,7 @@ module Decidim
           {
             title: t("assembly_type", scope: "decidim.assemblies.show"),
             icon: "group-2-line",
-            text: assembly_type
+            text: decidim_sanitize_translated(assembly_type)
           }
         end
 

data/app/cells/decidim/assemblies/content_blocks/metadata_cell.rb

@@ -11,7 +11,7 @@ module Decidim
         end
 
         def space_presenter
-          AssemblyPresenter
+          Decidim::Assemblies::AssemblyPresenter
         end
 
         def translations_scope

data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb

@@ -19,9 +19,10 @@ module Decidim
 
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
-            participatory_space_admin_layout
-
             helper_method :current_assembly
+            add_breadcrumb_item_from_menu :admin_assembly_menu
+
+            participatory_space_admin_layout
 
             def current_assembly
               @current_assembly ||= organization_assemblies.find_by!(

data/app/events/decidim/assemblies/create_assembly_member_event.rb

@@ -6,7 +6,7 @@ module Decidim
       i18n_attributes :resource_name
 
       def resource_name
-        @resource_name ||= translated_attribute(assembly.title)
+        @resource_name ||= decidim_sanitize_translated(assembly.title)
       end
 
       def assembly

data/app/events/decidim/role_assigned_to_assembly_event.rb

@@ -2,13 +2,8 @@
 
 module Decidim
   class RoleAssignedToAssemblyEvent < Decidim::Events::SimpleEvent
-    include Decidim::Events::NotificationEvent
     include Decidim::Events::AuthorEvent
 
-    def notification_title
-      I18n.t("notification_title", **i18n_options).html_safe
-    end
-
     def i18n_role
       I18n.t(extra["role"], scope: "decidim.admin.models.assembly_user_role.roles", default: extra["role"])
     end

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -53,7 +53,7 @@ module Decidim
            )
         ] + components.map do |component|
           {
-            name: translated_attribute(component.name),
+            name: decidim_escape_translated(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

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

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("info", scope: "decidim.admin.menu.assemblies_submenu")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("info", scope: "decidim.admin.menu.assemblies_submenu") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

@@ -3,14 +3,14 @@
 
   <% if parent_assembly && parent_assembly.self_and_ancestors.length %>
     <div class="item_show__header">
-      <h2 class="item_show__header-title">
+      <h1 class="item_show__header-title">
         <% parent_assembly.self_and_ancestors.each_with_index do |assembly, ix| %>
           <%= translated_attribute(assembly.title) %>
           <% unless ix == parent_assembly.self_and_ancestors.length - 1 %>
             &gt;
           <% end %>
         <% end if parent_assembly %>
-      </h2>
+      </h1>
     </div>
   <% end %>
 
@@ -48,6 +48,8 @@
 
               <% if allowed_to? :update, :assembly, assembly: assembly %>
                 <%= link_to translated_attribute(assembly.title), edit_assembly_path(assembly) %>
+              <% elsif allowed_to? :read, :component, assembly: assembly %>
+                <%= link_to translated_attribute(assembly.title), components_path(assembly) %><br>
               <% else %>
                 <%= translated_attribute(assembly.title) %>
               <% end %>

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

@@ -1,9 +1,9 @@
 <% add_decidim_page_title(t("assemblies.new.title", scope: "decidim.admin")) %>
 
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t "assemblies.new.title", scope: "decidim.admin" %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

data/app/views/decidim/assemblies/admin/assemblies_types/index.html.erb

@@ -2,12 +2,12 @@
 
 <div class="card" id="assembly-types">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t "decidim.admin.titles.assemblies_types" %>
       <%= link_to t("actions.new_assembly_type", scope: "decidim.admin"),
                   [:new, :assemblies_type],
                   class: "button button__sm button__secondary" if allowed_to? :create, :assembly_type %>
-    </h2>
+    </h1>
   </div>
   <div class="table-scroll">
     <table class="table-list">

data/app/views/decidim/assemblies/admin/assemblies_types/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("assemblies_types.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assemblies_types.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/assemblies/admin/assembly_copies/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("assembly_copies.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assembly_copies.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 
 <div class="item__edit item__edit-1col">

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

data/app/views/decidim/assemblies/admin/assembly_members/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("assembly_members.edit.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assembly_members.edit.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb

@@ -1,11 +1,11 @@
 <% add_decidim_page_title(t("assembly_members_title", scope: "decidim.admin.assembly_members.index")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assembly_members_title", scope: "decidim.admin.assembly_members.index") %>
     <% if allowed_to? :create, :assembly_member %>
       <%= link_to t("actions.new_assembly_member", scope: "decidim.admin"), new_assembly_member_path(current_assembly), class: "button button__sm button__secondary new" %>
     <% end %>
-  </h2>
+  </h1>
 </div>
 
 <div class="card" id="assembly_members">

data/app/views/decidim/assemblies/admin/assembly_members/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("assembly_members.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assembly_members.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

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

@@ -10,7 +10,7 @@
         </div>
         <div class="columns">
           <%= form.label :role %>
-          <%= select :assembly_user_role, :role, @form.roles, include_blank: false %>
+          <%= select :assembly_user_role, :role, options_for_select(@form.roles, @user_role&.role) %>
         </div>
       </div>
     </div>

data/app/views/decidim/assemblies/admin/assembly_user_roles/edit.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("assembly_user_roles.edit.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assembly_user_roles.edit.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/decidim/assemblies/admin/assembly_user_roles/index.html.erb

@@ -1,12 +1,12 @@
 <% add_decidim_page_title(t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin")) %>
 <div class="card" id="assembly_admins">
   <div class="item_show__header">
-    <h2 class="item_show__header-title">
+    <h1 class="item_show__header-title">
       <%= t("assembly_user_roles.index.assembly_admins_title", scope: "decidim.admin") %>
       <% 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 %>
-    </h2>
+    </h1>
   </div>
   <%= admin_filter_selector %>
   <div class="table-scroll">

data/app/views/decidim/assemblies/admin/assembly_user_roles/new.html.erb

@@ -1,8 +1,8 @@
 <% add_decidim_page_title(t("assembly_user_roles.new.title", scope: "decidim.admin")) %>
 <div class="item_show__header">
-  <h2 class="item_show__header-title">
+  <h1 class="item_show__header-title">
     <%= t("assembly_user_roles.new.title", scope: "decidim.admin") %>
-  </h2>
+  </h1>
 </div>
 <div class="item__edit item__edit-1col">
   <div class="item__edit-form">

data/app/views/layouts/decidim/admin/_manage_assemblies.html.erb

@@ -5,32 +5,7 @@
     </span>
     <%= icon "arrow-down-s-line" %>
   <% end %>
-  <div id="assemblies-dropdown-menu-settings" aria-hidden="true">
-    <ul class="dropdown dropdown__bottom">
-      <% if allowed_to? :import, :assembly %>
-        <li class="dropdown__item">
-          <%= icon "price-tag-3-line", class: "fill-gray-2" %>
-          <%= link_to t("actions.import_assembly", scope: "decidim.admin"),
-                      new_import_path,
-                      class: "text-secondary" %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:read, :assembly_list) %>
-        <li class="dropdown__item">
-          <%= icon "government-line" %>
-          <%= link_to t("menu.assemblies", scope: "decidim.admin"),
-                      decidim_admin_assemblies.assemblies_path,
-                      class: "text-secondary" %>
-        </li>
-      <% end %>
-      <% if  allowed_to?(:manage, :assemblies_type) %>
-        <li class="dropdown__item">
-          <%= icon "government-line" %>
-          <%= link_to t("menu.assemblies_types", scope: "decidim.admin"),
-                      decidim_admin_assemblies.assemblies_types_path,
-                      class: "text-secondary" %>
-        </li>
-      <% end %>
-    </ul>
+  <div id="assemblies-dropdown-menu-settings" class="process-title-content-dropdown" aria-hidden="true">
+    <%= dropdown_menu(:admin_assemblies_menu).render %>
   </div>
 </div>

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

@@ -1,7 +1,8 @@
 <% content_for :breadcrumb_context_menu do %>
   <div class="process-title-content-breadcrumb-container-right">
     <% if allowed_to? :create, :assembly %>
-      <%= link_to new_assembly_path(parent_id: parent_assembly&.id), class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link" do %>
+      <% link = defined?(parent_assembly) ? new_assembly_path(parent_id: parent_assembly&.id) : new_assembly_path %>
+      <%= link_to link, class: "button button__sm button__transparent process-title-content-breadcrumb-container-right-link" do %>
         <%= icon "add-line", class: "w-4 h-4" %>
         <span>
           <%= t("actions.new_assembly", scope: "decidim.admin") %>

data/config/locales/ar.yml

@@ -57,6 +57,7 @@ ar:
         subtitle: العنوان الفرعي
         target: من يشارك
         title: العنوان
+        twitter: X
         weight: موضع الطلب
         youtube: يوتيوب
       assembly_member:
@@ -199,7 +200,6 @@ ar:
           categories: الفئات
           components: المكونات
           moderations: الإعتدال
-          private_users: المستخدمون الخاصون
         assemblies_types: نوع التجمّعات
       models:
         assemblies_types:
@@ -283,7 +283,6 @@ ar:
             select_parent_assembly: حدد الجمعية الأصلية
             social_handlers: التواصل الاجتماعي
             title: معلومات عامة
-            visbility: الرؤية
         assemblies_types:
           form:
             title: العنوان