decidim-assemblies 0.28.3 → 0.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a16649518271f3a2049f530268fe608eee09079f6491498235681c7557c2d1e
-  data.tar.gz: c4bdd9e76df3314ca72571c3d12b1656849df8db59a817ff70a9b06f72cbd41d
+  metadata.gz: a96e6c34d80c5256ca5da335a25de147e9fee9ab6a451eae435ecefbc41c4aec
+  data.tar.gz: b0f0a58481be26eb3acb13a63e6894fdaa8c72ff00b2830c84e80e277dfc691f
 SHA512:
-  metadata.gz: c072d797227785aa510389d0be5c4332cbacf194a27b9f09618d60a4713adc2b98f3dd9f7b9049e20a94c28d9dc59b5ba3c5a19baa9dff8a8608cd55e6dd28a9
-  data.tar.gz: 6102c1ec728707d9dbbcf097da718812b34b2fa75b3b3d5a8b4325def3f258855f703dfe2681baf9d0a24bc09154fb02b06c14df9d64bfaa09eca95f12d587cd
+  metadata.gz: aadfbbffa02fa1773355e37e3db335cd9ebd51edb7d143297ecf89398393af62b43310cea35a66ca653f7ab7a3a05b9934ca0a31614ccfa7bd3cc19ca427b7be
+  data.tar.gz: fd37d3cd9f695dbec77149a28219b3d7e7e2aa7ca6a603eca61a1209885124386cd1e74a314b2de3d57d1e110c8c33364a29cfe3e20c8946a1b25bfbd1ae263d

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
+          params[:parent_id]
+        end
+
+        def assembly_parent_id
+          params[:assembly][:parent_id]
         end
 
         def assembly_params

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/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/ca.yml

@@ -207,7 +207,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
@@ -339,13 +339,13 @@ 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

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: Hinzugefügt am
         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
@@ -283,11 +283,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
@@ -331,8 +331,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
@@ -396,7 +396,7 @@ de:
             member_of: Mitglied von
       show:
         assembly_type: Montageart
-        duration: Dauer
+        duration: Aktiv bis
         is_transparent:
           'false': undurchsichtig
           'true': transparent

data/config/locales/sv.yml

@@ -11,7 +11,7 @@ sv:
         assembly_type_other: Annan typ av samråd
         banner_image: Bannerbild
         closing_date: Slutdatum
-        closing_date_reason: Skäl till slutdatum
+        closing_date_reason: Anledning till avslut
         composition: Sammansättning
         copy_categories: Kopiera kategorier
         copy_components: Kopiera komponenter
@@ -34,20 +34,20 @@ sv:
         import_attachments: Importera bilagor
         import_categories: Importera kategorier
         import_components: Importera komponenter
-        included_at: Inkluderad vid
+        included_at: Publicerad
         instagram: Instagram
-        internal_organisation: Intern organisation
+        internal_organisation: Organisation
         is_transparent: Är transparent
         local_area: Område
         meta_scope: Metadata för indelning
         parent_id: Överordnat samråd
         participatory_processes_ids: Relaterade deltagandeprocesser
-        participatory_scope: Vad som beslutas
-        participatory_structure: Hur bestäms det
+        participatory_scope: Vad beslutas
+        participatory_structure: Hur fattas beslut
         private_space: Privat utrymme
-        promoted: Uppmärksammad
+        promoted: Utvald
         published_at: Publicerad
-        purpose_of_action: Syfte med åtgärden
+        purpose_of_action: Syfte
         scope_id: Indelning
         scopes_enabled: Aktivera indelningar
         short_description: Kort beskrivning
@@ -85,7 +85,7 @@ sv:
     models:
       decidim/assembly:
         one: Samråd
-        other: Grupper
+        other: Samråd
       decidim/assembly_member:
         one: Medlem i samråd
         other: Medlemmar i samråd
@@ -223,7 +223,7 @@ sv:
             actions: Åtgärder
             created_at: Skapad
             private: Privat
-            promoted: Uppmärksammad
+            promoted: Utvald
             published: Publicerad
             title: Titel
           name: Samråd
@@ -336,7 +336,7 @@ sv:
           indefinite_duration: Permanent
           local_area: Organisationsområde
           meta_scope: Indelning
-          participatory_scope: Vad som beslutas
+          participatory_scope: Vad beslutas
           participatory_structure: Så fattas beslut
           target: Deltagare
           title: Om samrådet
@@ -365,7 +365,7 @@ sv:
         extra_data:
           name: Typ & varaktighet
         highlighted_assemblies:
-          name: Viktiga samråd
+          name: Viktiga samråd just nu
         related_assemblies:
           name: Relaterade samråd
       created_by:
@@ -389,7 +389,7 @@ sv:
       pages:
         home:
           highlighted_assemblies:
-            active_spaces: Aktiva samråd
+            active_spaces: Pågående samråd
             see_all_spaces: Visa alla samråd
         user_profile:
           member_of:
@@ -452,7 +452,7 @@ sv:
           more_info: Mer information
           take_part: Delta
         index:
-          promoted_assemblies: Viktiga samråd
+          promoted_assemblies: Viktiga samråd just nu
         metadata:
           children_item:
             one: "%{count} samråd"

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.28.3"
+      "0.28.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.28.3
+  version: 0.28.4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.3
+        version: 0.28.4
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com