decidim-assemblies 0.29.0 → 0.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26df3251335c184f28dea2d92096db70e22d98d53ffea82b2d94ad4b2e94a2fd
-  data.tar.gz: 4597fdb5ad6bde4ad46ea3287fe0f81bfd3aa529ad6ab51ce5f55459e87550bb
+  metadata.gz: b74ba273556ca0e94a759cbd5113716342eba68ac7f4ec0b259ae563167b3fb8
+  data.tar.gz: 9e44b00be96f1fe4c7a22558cea599aff5c40a681f1d506fae075cc00ed15fa1
 SHA512:
-  metadata.gz: cc81845a9fd7f8434373f3401fbc232fff9a2430a6431bca5d91407317906260cf1d03dbcefcb2009ad9ce7fad6855d17b86856a14a12003062d313e9d38138f
-  data.tar.gz: 486e927b0b2f90ef2ab0319285f7a2d1c465cf44c42ddb42f71dd2c45a14c018fdec78be35365410c982ebe2c3cb555d27e4da21fd0518d7959bbf2377e41f0f
+  metadata.gz: ae74d4d6e9ca6b7e1b50793ad96902846ae0cae14077cfded2e60fe85872c33c132d64c6e4a70d676fe430e3496facfaacfab77dd97fd9474dab5b19829d5ca1
+  data.tar.gz: 0fcb0bf1dcef6daec9b9f7d2c535a4733de1ca7b961ff56ced152cc68313a28e030e63e5331c0a6b51e448b6da2f0e39549308bc8baf894524fa230438038a48

data/app/controllers/decidim/assemblies/admin/assemblies_controller.rb

@@ -17,13 +17,13 @@ module Decidim
         end
 
         def new
-          enforce_permission_to :create, :assembly
+          enforce_permission_to :create, :assembly, assembly: parent_assembly
           @form = form(AssemblyForm).instance
           @form.parent_id = params[:parent_id]
         end
 
         def create
-          enforce_permission_to :create, :assembly
+          enforce_permission_to :create, :assembly, assembly: parent_assembly
           @form = form(AssemblyForm).from_params(params)
 
           CreateAssembly.call(@form) do
@@ -66,7 +66,7 @@ module Decidim
         end
 
         def copy
-          enforce_permission_to :create, :assembly
+          enforce_permission_to :create, :assembly, assembly: collection.find_by(id: params[:parent_id])
         end
 
         private
@@ -84,7 +84,22 @@ module Decidim
         alias current_participatory_space current_assembly
 
         def parent_assembly
-          @parent_assembly ||= collection.find_by(id: ransack_params[:parent_id_eq])
+          @parent_assembly ||= collection.find_by(id: parent_assembly_id)
+        end
+
+        def parent_assembly_id
+          # Return the parent_id from Ransack parameters if it exists
+          return ransack_params[:parent_id_eq] if ransack_params[:parent_id_eq].present?
+
+          # If the assembly parameter is present, return its parent_id
+          return assembly_parent_id if params[:assembly].present?
+
+          # Otherwise, return the parent_id from the params hash
+          return params[:parent_id]
+        end
+
+        def assembly_parent_id
+          params[:assembly][:parent_id]
         end
 
         def assembly_params

data/app/controllers/decidim/assemblies/admin/assembly_landing_page_content_blocks_controller.rb

@@ -10,6 +10,8 @@ module Decidim
 
         layout "decidim/admin/assemblies"
 
+        helper_method :parent_assembly
+
         private
 
         def content_block_scope
@@ -29,6 +31,10 @@ module Decidim
         def resource_landing_page_content_block_path
           assembly_landing_page_content_block_path(scoped_resource, params[:id])
         end
+
+        def parent_assembly
+          scoped_resource.parent
+        end
       end
     end
   end

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -14,23 +14,23 @@ module Decidim
 
         mimic :assembly
 
-        translatable_attribute :composition, String
-        translatable_attribute :closing_date_reason, String
+        translatable_attribute :composition, Decidim::Attributes::RichText
+        translatable_attribute :closing_date_reason, Decidim::Attributes::RichText
         translatable_attribute :created_by_other, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         translatable_attribute :developer_group, String
-        translatable_attribute :internal_organisation, String
+        translatable_attribute :internal_organisation, Decidim::Attributes::RichText
         translatable_attribute :local_area, String
         translatable_attribute :meta_scope, String
         translatable_attribute :participatory_scope, String
         translatable_attribute :participatory_structure, String
-        translatable_attribute :purpose_of_action, String
-        translatable_attribute :short_description, String
-        translatable_attribute :special_features, String
+        translatable_attribute :purpose_of_action, Decidim::Attributes::RichText
+        translatable_attribute :short_description, Decidim::Attributes::RichText
+        translatable_attribute :special_features, Decidim::Attributes::RichText
         translatable_attribute :subtitle, String
         translatable_attribute :target, String
         translatable_attribute :title, String
-        translatable_attribute :announcement, String
+        translatable_attribute :announcement, Decidim::Attributes::RichText
 
         attribute :created_by, String
         attribute :facebook_handler, String

data/app/models/decidim/assembly.rb

@@ -122,6 +122,11 @@ module Decidim
       Decidim::Assemblies::AdminLog::AssemblyPresenter
     end
 
+    # This is a overwrite for Decidim::ParticipatorySpaceResourceable.visible?
+    def visible?
+      published? && (!private_space? || (private_space? && is_transparent?))
+    end
+
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end

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

@@ -176,7 +176,7 @@ module Decidim
         return unless permission_action.action == :create &&
                       permission_action.subject == :assembly
 
-        toggle_allow(user.admin? || admin_assembly? || user_role == "admin")
+        toggle_allow(user.admin? || admin_assembly?)
       end
 
       def user_can_export_assembly?

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

@@ -6,11 +6,11 @@ module Decidim
       include Decidim::TranslationsHelper
 
       def hero_image_url
-        assembly.attached_uploader(:hero_image).url(host: assembly.organization.host)
+        assembly.attached_uploader(:hero_image).url
       end
 
       def banner_image_url
-        assembly.attached_uploader(:banner_image).url(host: assembly.organization.host)
+        assembly.attached_uploader(:banner_image).url
       end
 
       def area_name

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

@@ -77,7 +77,7 @@
                <% else %>
                  <span class="action-space icon"></span>
                <% end %>
-               <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
+               <% if assembly.children.count.positive? || allowed_to?(:read, :assembly, assembly:) %>
                  <%= icon_link_to "government-line",
                                   url_for(query_params_with(parent_id_eq: assembly.id)),
                                   t("decidim.admin.titles.assemblies"),
@@ -85,7 +85,7 @@
                <% else %>
                  <span class="action-space icon"></span>
                <% end %>
-              <% if allowed_to? :copy, :assembly, assembly: assembly %>
+               <% if allowed_to? :copy, :assembly, assembly: assembly, assembly: parent_assembly %>
                 <%= icon_link_to "file-copy-line", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
               <% else %>
                 <span class="action-space icon"></span>

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

@@ -1,6 +1,6 @@
 <% content_for :breadcrumb_context_menu do %>
   <div class="process-title-content-breadcrumb-container-right">
-    <% if allowed_to? :create, :assembly %>
+    <% if allowed_to? :create, :assembly, assembly: parent_assembly %>
       <% 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" %>

data/config/locales/ar.yml

@@ -48,7 +48,7 @@ ar:
         promoted: سلط الضوء
         published_at: نشرت في
         purpose_of_action: الغرض من العمل
-        scope_id: نطاق
+        scope_id: النطاق
         scopes_enabled: النطاقات المُفعّلَة
         short_description: وصف قصير
         slug: سبيكة العنوان الشبكي
@@ -187,7 +187,7 @@ ar:
           success: تم تحديث المشرف على هذه الجمعية بنجاح.
       filters:
         decidim_assemblies_type_id_eq:
-          label: نوع الجمعية
+          label: نوع التجمع
       menu:
         assemblies: الجمعيات
         assemblies_submenu:
@@ -199,7 +199,7 @@ ar:
           categories: الفئات
           components: المكونات
           moderations: الإعتدال
-        assemblies_types: نوع التجمّعات
+        assemblies_types: أنواع التجمّعات
       models:
         assemblies_types:
           fields:
@@ -207,6 +207,7 @@ ar:
             title: العنوان
         assembly:
           fields:
+            actions: الإجراءات
             created_at: تاريخ الإنشاء
             private: خاص
             promoted: سلط الضوء
@@ -218,7 +219,7 @@ ar:
             ceased_date: تاريخ التوقف
             designation_date: تاريخ التعيين
             full_name: الاسم
-            position: موضع
+            position: الموقع
           name: عضو
           positions:
             other: آخر
@@ -313,9 +314,9 @@ ar:
         commission: اللجنة
         consultative_advisory: استشاري / الاستشارية
         executive: تنفيذية
-        government: حكومية
+        government: الحكومية
         others: أخرى
-        participatory: تشاركية
+        participatory: التشاركية
         working_group: فريق العمل
       content_blocks:
         children_assemblies:
@@ -345,7 +346,7 @@ ar:
           member_of:
             member_of: عضو في
       show:
-        assembly_type: نوع الجمعية
+        assembly_type: نوع التجمع
         duration: المدة الزمنية
         private_space: هذه جمعية خاصة
         social_networks_title: زيارة التجمع على

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,44 @@
+---
+bs:
+  decidim:
+    admin:
+      actions:
+        new_assembly_type: Novi tip veća
+      assemblies_types:
+        create:
+          error: Nastao je problem pri stvaranju novog tipa veća.
+          success: Tip veća uspešno stvoren.
+        destroy:
+          success: Tip veća uspešno obrisan.
+        new:
+          title: Novi tip veća
+        update:
+          error: Nastao je problem pri ažuriranju ovog tipa veća.
+          success: Tip veća uspešno ažuriran.
+      menu:
+        assemblies_types: Tipovi veća
+      models:
+        assembly_user_role:
+          roles:
+            valuator: Procenjivač
+      titles:
+        assemblies_types: Tipovi veća
+    admin_log:
+      assembly_type:
+        create: "%{user_name} je stvorio tip veća %{resource_name}"
+        publish: "%{user_name} je objavio tip veća %{resource_name}"
+        unpublish: "%{user_name} je odustao od objavljivanja tipa veća %{resource_name}"
+        update: "%{user_name} je ažurirao tip veća %{resource_name}"
+    events:
+      assemblies:
+        create_assembly_member:
+          email_subject: Pozvani ste da postanete član veća %{resource_name}!
+      assembly:
+        role_assigned:
+          email_intro: Imenovani ste na funkciju %{role} veća %{resource_title}.
+          email_outro: Dobili ste ovo obaveštenje zbog toga što ste %{role} veća %{resource_title}.
+          email_subject: Imenovani ste na funkciju %{role} %{resource_title}.
+    log:
+      value_types:
+        assembly_type_presenter:
+          not_found: 'Ovaj tip veća nije pronađen u bazi podataka (ID: %{id})'

data/config/locales/ca.yml

@@ -153,7 +153,7 @@ ca:
           success: El membre per a aquesta assemblea s'ha eliminat correctament.
         edit:
           title: Actualitzar membre de l'assemblea
-          update: Actualitza
+          update: Actualitzar
         index:
           assembly_members_title: Membres de l'assemblea
         new:
@@ -206,7 +206,7 @@ ca:
           attachments: Adjunts
           categories: Categories
           components: Components
-          info: Sobre aquesta assemblea
+          info: Quant a aquesta assemblea
           landing_page: Pàgina d'inici
           moderations: Moderacions
           private_users: Participants privades
@@ -338,23 +338,23 @@ ca:
           participatory_scope: Què es decideix
           participatory_structure: Com es decideix
           target: Qui participa
-          title: Sobre aquesta assemblea
+          title: Quant a aquesta assemblea
         filters:
           names:
             all: Totes
           type: Tipus
         show:
-          title: Sobre aquesta assemblea
+          title: Quant a aquesta assemblea
       assembly_members:
         index:
           members: Membres
       assembly_types:
         commission: Comissió
         consultative_advisory: Consultiva / Assessora
-        executive: Executiva
+        executive: Executiu
         government: Govern
         others: Altres
-        participatory: Participativa
+        participatory: Participatiu
         working_group: Grup de treball
       content_blocks:
         children_assemblies:

data/config/locales/cs.yml

@@ -3,7 +3,7 @@ cs:
   activemodel:
     attributes:
       assemblies_type:
-        title: Název
+        title: Titul
       assembly:
         announcement: Oznámení
         area_id: Oblast
@@ -356,7 +356,7 @@ cs:
           members: Členové
       assembly_types:
         commission: Komise
-        consultative_advisory: Konzultační / poradní
+        consultative_advisory: Poradní / poradní
         executive: Výkonný
         government: Vládní
         others: Ostatní

data/config/locales/de.yml

@@ -10,15 +10,15 @@ de:
         assembly_type: Versammlungstyp
         assembly_type_other: Sonstiger Versammlungstyp
         banner_image: Banner-Bild
-        closing_date: Einsendeschluss
-        closing_date_reason: Schlussdatums Grund
+        closing_date: Auflösungsdatum
+        closing_date_reason: Grund der Auflösung
         composition: Zusammensetzung
         copy_categories: Kategorien kopieren
         copy_components: Komponenten kopieren
         copy_features: Funktionen kopieren
         created_by: Erstellt von
         created_by_other: Erstellt von anderen
-        creation_date: Datum erstellt
+        creation_date: Gründungsdatum
         decidim_area_id: Bereich
         decidim_assemblies_type_id: Versammlungstyp
         decidim_scope_id: Umfang
@@ -26,7 +26,7 @@ de:
         developer_group: Promoter-Gruppe
         document: Dokument
         domain: Domain
-        duration: Dauer
+        duration: Aktiv bis
         facebook: Facebook
         github: GitHub
         hashtag: Hashtag
@@ -34,7 +34,7 @@ de:
         import_attachments: Anhänge importieren
         import_categories: Kategorien importieren
         import_components: Komponenten importieren
-        included_at: Inbegriffen bei
+        included_at: Inbegriffen in
         instagram: Instagram
         internal_organisation: Interne Organisation
         is_transparent: Ist transparent
@@ -47,7 +47,7 @@ de:
         private_space: Privatsphäre
         promoted: Hervorgehoben
         published_at: Veröffentlicht am
-        purpose_of_action: Zweck der Aktion
+        purpose_of_action: Handlungszweck
         scope_id: Umfang
         scopes_enabled: Bereiche aktiviert
         short_description: Kurze Beschreibung
@@ -282,11 +282,11 @@ de:
         assemblies:
           form:
             announcement_help: Der Text, den Sie hier eingeben, wird dem Benutzer direkt unter den Gremien-Informationen angezeigt.
-            duration: Dauer
-            duration_help: Wenn die Dauer dieser Assembly begrenzt ist, wählen Sie das Enddatum aus. Andernfalls wird es als unbestimmt angezeigt.
+            duration: Aktiv bis
+            duration_help: Wenn die Dauer dieses Gremiums begrenzt ist, dann wählen Sie hier das Enddatum aus. Andernfalls wird das Datum als unbestimmt angezeigt.
             filters: Filter
             images: Bilder
-            included_at_help: Wählen Sie das Datum aus, an dem dieses Gremium zu Decidim hinzugefügt wurde. Es muss nicht unbedingt mit dem Erstellungsdatum identisch sein.
+            included_at_help: Wählen Sie das Datum aus, an dem dieses Gremium zur Plattform hinzugefügt wurde. Das Datum muss nicht zwingend mit dem Gründungsdatum übereinstimmen.
             metadata: Metadaten
             other: Andere
             select_a_created_by: Wählen Sie eine erstellt von aus
@@ -330,8 +330,8 @@ de:
           creation_date: Erstellungsdatum
           data: Gremiendaten
           developer_group: Gruppe der Unterstützenden
-          duration: Dauer
-          included_at: Inbegriffen in
+          duration: Aktiv bis
+          included_at: Hinzugefügt am
           indefinite_duration: Unbestimmt
           local_area: Gebiet der Organisation
           meta_scope: Bereich
@@ -350,11 +350,11 @@ de:
           members: Mitglieder
       assembly_types:
         commission: Kommission
-        consultative_advisory: Beratende / Beratende
-        executive: Exekutive
+        consultative_advisory: Beratung / Beratung
+        executive: Executive
         government: Regierung
         others: Andere
-        participatory: Teilnehmend
+        participatory: Partizipativ
         working_group: Arbeitsgruppe
       content_blocks:
         children_assemblies:
@@ -394,8 +394,8 @@ de:
           member_of:
             member_of: Mitglied von
       show:
-        assembly_type: Montageart
-        duration: Dauer
+        assembly_type: Versammlungstyp
+        duration: Aktiv bis
         private_space: Dies ist eine private Versammlung
         social_networks_title: Gremium besuchen unter
     assembly_members:
@@ -409,7 +409,7 @@ de:
           email_intro: Ein Administrator des Gremiums <a href="%{resource_url}">%{resource_name}</a> hat Sie als Mitglied eingeladen.
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie zu einem Gremium eingeladen wurden. Gehen Sie zur <a href="%{resource_url}">Gremiumsseite</a>, um mitzumachen!
           email_subject: Sie wurden als Mitglied des Gremiums %{resource_name} eingeladen!
-          notification_title: Sie wurden als Mitglied des Gremiums <a href="%{resource_path}">%{resource_name}</a> registriert. Gehen Sie zur <a href="%{resource_path}">Gremiumsseite</a>, um mitzuwirken!
+          notification_title: Sie wurden als Mitglied des Gremiums <a href="%{resource_path}">%{resource_name}</a> eingetragen. Gehen Sie zur <a href="%{resource_path}">Gremiumsseite</a>, um mitzuwirken!
       assembly:
         role_assigned:
           email_intro: Sie wurden als %{role} für die Versammlung "%{resource_title}" ausgewählt.

data/config/locales/es-MX.yml

@@ -193,7 +193,7 @@ es-MX:
             'false': No cesada
             'true': Cesada
         decidim_assemblies_type_id_eq:
-          label: Tipo de asamblea
+          label: Tipo de montaje
         search_placeholder:
           full_name_or_user_name_or_user_nickname_cont: Buscar por nombre o alias
       menu:
@@ -211,7 +211,7 @@ es-MX:
           moderations: Moderaciones
           private_users: Participantes privadas
           see_assembly: Ver la asamblea
-        assemblies_types: Tipos de asamblea
+        assemblies_types: Tipo de asamblea
       models:
         assemblies_types:
           fields:
@@ -350,7 +350,7 @@ es-MX:
           members: Miembros
       assembly_types:
         commission: Comisión
-        consultative_advisory: Consultivo / Asesor
+        consultative_advisory: Consultivo / Asesoramiento
         executive: Ejecutivo
         government: Gobierno
         others: Otros
@@ -394,7 +394,7 @@ es-MX:
           member_of:
             member_of: Miembro de
       show:
-        assembly_type: Tipo de asambleas
+        assembly_type: Tipo de montaje
         duration: Duración
         private_space: Esta es una asamblea privada
         social_networks_title: Visita la asamblea en

data/config/locales/es-PY.yml

@@ -193,7 +193,7 @@ es-PY:
             'false': No cesada
             'true': Cesada
         decidim_assemblies_type_id_eq:
-          label: Tipo de asamblea
+          label: Tipo de montaje
         search_placeholder:
           full_name_or_user_name_or_user_nickname_cont: Buscar por nombre o alias
       menu:
@@ -211,7 +211,7 @@ es-PY:
           moderations: Moderaciones
           private_users: Participantes privadas
           see_assembly: Ver la asamblea
-        assemblies_types: Tipos de asamblea
+        assemblies_types: Tipo de asamblea
       models:
         assemblies_types:
           fields:
@@ -350,7 +350,7 @@ es-PY:
           members: Miembros
       assembly_types:
         commission: Comisión
-        consultative_advisory: Consultivo / Asesor
+        consultative_advisory: Consultivo / Asesoramiento
         executive: Ejecutivo
         government: Gobierno
         others: Otros
@@ -394,7 +394,7 @@ es-PY:
           member_of:
             member_of: Miembro de
       show:
-        assembly_type: Tipo de asambleas
+        assembly_type: Tipo de montaje
         duration: Duración
         private_space: Esta es una asamblea privada
         social_networks_title: Visita la asamblea en

data/config/locales/es.yml

@@ -211,7 +211,7 @@ es:
           moderations: Moderaciones
           private_users: Participantes privadas
           see_assembly: Ver la asamblea
-        assemblies_types: Tipos de asamblea
+        assemblies_types: Tipo de asamblea
       models:
         assemblies_types:
           fields:
@@ -351,10 +351,10 @@ es:
       assembly_types:
         commission: Comisión
         consultative_advisory: Consultiva / Asesora
-        executive: Ejecutiva
+        executive: Ejecutivo
         government: Gobierno
         others: Otros
-        participatory: Participativa
+        participatory: Participativo
         working_group: Grupo de trabajo
       content_blocks:
         children_assemblies:
@@ -394,7 +394,7 @@ es:
           member_of:
             member_of: Miembro de
       show:
-        assembly_type: Tipo de asambleas
+        assembly_type: Tipo de asamblea
         duration: Duración
         private_space: Esta es una asamblea privada
         social_networks_title: Visita la asamblea en