decidim-assemblies 0.32.0.rc3 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2559ffed17d5a732fcb20a0d7c95728576c8804d98873f53c5e588037a8c4f62
-  data.tar.gz: 170eb7d950b59e5d7f62f3fdf2ef85755bdbfed4c5ef543b86cf9eb196924559
+  metadata.gz: a228da39c3efd6cd576b5062dfb95ea17bbace2e647121bb18ca960f60ecabce
+  data.tar.gz: 9c220e956ed5eb9cf43852564822b68f6f10dd28760e578162b5541532c7afee
 SHA512:
-  metadata.gz: dbc8e0dbe8e7caea5edb3c2e063602a875ac09fa5cdd83c6912a463fb3824571c14185a87f4d863a1bd18983c9025797de5f7f950920b1f5bca6e40c9eb2473f
-  data.tar.gz: 9c8e1079afd500358963d082a2f0ef659fc54e0b8f11556538766d4f2272097f899f71039f2cf65adeadaaafac3dfb9ff075c1fbc0f7963ea70abe1f800422c2
+  metadata.gz: c7995e87556f38fff4828da0446dbf28e7c0f3675af5ca33c2d416e25266bef028df21ffe734a464f566eeb3659a9f518c03a591ac60723c23a5ffa7a77f02d0
+  data.tar.gz: a6b2bab8fa4630fc4aa00c075a056a3e598a0c0ee5794ad26140e554037a8e0f3ae70d92b11b9358b669f9653664404f030bb1c351d40783f54afab8557e7b77

data/app/events/decidim/assembly_member_added_event.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  class AssemblyMemberAddedEvent < Decidim::ParticipatorySpace::MemberAddedEvent
+    def members_page
+      decidim_assemblies.assembly_members_url(participatory_space,
+                                              host: participatory_space.organization.host)
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationAssemblies.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

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

@@ -118,6 +118,7 @@ module Decidim
 
         def slug_uniqueness
           return unless organization_assemblies
+                        .with_deleted
                         .where(slug:)
                         .where.not(id: context[:assembly_id])
                         .any?

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

@@ -74,7 +74,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
+          return unless OrganizationAssemblies.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

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

@@ -105,8 +105,8 @@ module Decidim
           end
         end
 
-        unless attachments["attachment_collections"].empty?
-          attachments["attachment_collections"].map do |collection|
+        if attachments["attachment_collections"].present?
+          attachments["attachment_collections"]&.map do |collection|
             Decidim.traceability.perform_action!("create", AttachmentCollection, @user) do
               create_attachment_collection(collection)
             end

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

@@ -11,14 +11,16 @@ edit_link(
 )
 %>
 
-<% content_for :aside do %>
-  <h1 class="title-decorator">
-    <%= t("members", scope: "decidim.participatory_space_members.index") %>
-  </h1>
-<% end %>
+<%= render layout: "layouts/decidim/shared/layout_center", locals: { columns: 10 } do %>
+  <header class="text-center py-10">
+    <h1 class="title-decorator inline-block text-left mb-12">
+      <%= t("members", scope: "decidim.participatory_space_members.index") %>
+    </h1>
+  </header>
 
-<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
   <section class="layout-main__section">
-    <%= render(collection) %>
+    <div class="grid grid-cols-1 md:grid-cols-3 gap-4 md:gap-12">
+      <%= render(collection) %>
+    </div>
   </section>
 <% end %>

data/config/locales/fr-CA.yml

@@ -165,6 +165,7 @@ fr-CA:
           attachments: Documents liés
           components: Composants
           info: À propos de cette assemblée
+          landing_page: Mise en page de la page d'accueil
           members: Membres
           moderations: Modérations
           see_assembly: Voir l'assemblée
@@ -234,6 +235,8 @@ fr-CA:
     assemblies:
       admin:
         assemblies:
+          edit:
+            title: À propos de cette assemblée
           form:
             access:
               label: Accès
@@ -397,7 +400,10 @@ fr-CA:
           created_at: La date de création de cet espace
           created_by: Qui a créé cette assemblée
           created_by_other: Autre créateur de l'assemblée
+          creation_date: La date de création de l'assemblée
+          decidim_scope_id: La portée de l'assemblée
           description: Une description longue de l'assemblée
+          developer_group: Le groupe promoteur de l'assemblée
           duration: La durée de l'assemblée
           follows_count: Le nombre d'utilisateurs suivant cet espace
           id: L'identifiant unique de cette assemblée

data/config/locales/fr.yml

@@ -90,7 +90,7 @@ fr:
   decidim:
     admin:
       actions:
-        confirm_delete_assembly: Êtes-vous sûr(e) de vouloir supprimer cette assemblée ? Si vous changez d'avis, vous pourrez la restaurer plus tard.
+        confirm_delete_assembly: Êtes-vous sûr·e de vouloir supprimer cette assemblée ? Si vous changez d'avis, vous pourrez la restaurer plus tard.
         import_assembly: Importer
         new_assembly: Nouvelle assemblée
         new_assembly_user_role: Nouvel administrateur de l'assemblée
@@ -165,6 +165,7 @@ fr:
           attachments: Documents liés
           components: Fonctionnalités
           info: À propos de cette assemblée
+          landing_page: Mise en page de la page d'accueil
           members: Membres
           moderations: Modérations
           see_assembly: Voir l'assemblée
@@ -234,6 +235,8 @@ fr:
     assemblies:
       admin:
         assemblies:
+          edit:
+            title: À propos de cette assemblée
           form:
             access:
               label: Accès
@@ -397,7 +400,10 @@ fr:
           created_at: La date de création de cet espace
           created_by: Qui a créé cette assemblée
           created_by_other: Autre créateur de l'assemblée
+          creation_date: La date de création de l'assemblée
+          decidim_scope_id: La portée de l'assemblée
           description: Une description longue de l'assemblée
+          developer_group: Le groupe promoteur de l'assemblée
           duration: La durée de l'assemblée
           follows_count: Le nombre d'utilisateurs suivant cet espace
           id: L'identifiant unique de cette assemblée

data/config/locales/ja.yml

@@ -99,6 +99,10 @@ ja:
         edit:
           update: 更新
         index:
+          access_modes:
+            open: 参加可能
+            restricted: メンバー限定
+            transparent: 閲覧のみ可能
           published: 公開済み
           unpublished: 未公開
         new:
@@ -165,6 +169,7 @@ ja:
       models:
         assembly:
           fields:
+            access_mode: アクセスモード
             actions: アクション
             created_at: 作成日時
             promoted: 強調表示
@@ -230,6 +235,13 @@ ja:
           edit:
             title: この参加スペースについて
           form:
+            access:
+              label: アクセス
+              options:
+                open: 誰もが参加スペースを閲覧、参加することができます。
+                restricted: この機能はメンバーおよび管理者のみが閲覧・参加可能です。一般的な検索、API、公開データファイルには表示されません。
+                transparent: 誰でも参加スペースの内容は閲覧できますが、参加できるのはメンバーおよび管理者のみです。
+              set_this_space_as: このスペースを以下の設定にします
             define_taxonomy_filters: この設定を使用する前に、参加型スペースのフィルターをいくつか定義してください。
             duration: 持続期間
             duration_help: この参加スペースの持続時間が限られている場合は、終了日を選択します。それ以外の場合は、不定義として表示されます。
@@ -376,6 +388,7 @@ ja:
     open_data:
       help:
         assemblies:
+          access_mode: アクセスモードです。参加スペースが参加可能か、メンバー限定か、閲覧のみ可能かを設定します。
           area: 参加スペースのエリア
           assembly_type: 参加スペースの種別
           closing_date: 参加スペースの終了日

data/config/locales/pt-BR.yml

@@ -321,7 +321,7 @@ pt-BR:
         home:
           highlighted_assemblies:
             active_spaces: Assembleias ativas
-            see_all_spaces: Ver todas as assembleias 
+            see_all_spaces: Ver todas as assembleias
       show:
         duration: Duração
         social_networks_title: Visite assembleia em

data/config/locales/tr-TR.yml

@@ -18,7 +18,7 @@ tr:
         decidim_scope_id: kapsam
         description: Açıklama
         developer_group: Tanıtım grubu
-        document: Belge 
+        document: Belge
         domain: domain
         duplicate_categories: Yinelenen kategoriler
         duplicate_features: Yinelenen özellikler
@@ -26,9 +26,9 @@ tr:
         facebook: Facebook
         github: GitHub
         hero_image: Ana resim
-        import_attachments: Eki içe aktar 
-        import_categories: Kategorileri içe aktar 
-        import_components: Bireşenleri içe aktar 
+        import_attachments: Eki içe aktar
+        import_categories: Kategorileri içe aktar
+        import_components: Bireşenleri içe aktar
         included_at: Dahil
         instagram: Instagram
         is_transparent: Şeffaf mı

data/decidim-assemblies.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.0.rc3"
+  version = "0.32.0"
   s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]

data/lib/decidim/assemblies/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.32.0.rc3
+  version: 0.32.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -17,70 +17,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc3
+        version: 0.32.0
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -146,6 +146,7 @@ files:
 - app/controllers/decidim/assemblies/application_controller.rb
 - app/controllers/decidim/assemblies/assemblies_controller.rb
 - app/controllers/decidim/assemblies/members_controller.rb
+- app/events/decidim/assembly_member_added_event.rb
 - app/events/decidim/role_assigned_to_assembly_event.rb
 - app/forms/decidim/assemblies/admin/assembly_duplicate_form.rb
 - app/forms/decidim/assemblies/admin/assembly_form.rb