decidim-assemblies 0.31.6 → 0.32.0.rc1

data/config/locales/sv.yml

@@ -1,4 +1,3 @@
----
 sv:
   activemodel:
     attributes:
@@ -26,6 +25,7 @@ sv:
         duration: Varaktighet
         facebook: Facebook
         github: GitHub
+        has_members: Det här samrådet har medlemmar
         hero_image: Startbild
         import_attachments: Importera bilagor
         import_categories: Importera kategorier
@@ -40,7 +40,6 @@ sv:
         participatory_processes_ids: Relaterade deltagandeprocesser
         participatory_scope: Vad beslutas
         participatory_structure: Hur fattas beslut
-        private_space: Privat utrymme
         promoted: Utvald
         published_at: Publicerad
         purpose_of_action: Syfte
@@ -102,13 +101,14 @@ sv:
         edit:
           update: Uppdatera
         index:
-          private: Privat
-          public: Medborgare
+          access_modes:
+            open: Öppen
+            restricted: Begränsad
+            transparent: Transparent
           published: Publicerad
           unpublished: Ej publicerade
         new:
           create: Skapa
-          title: Nytt samråd
         update:
           error: Det gick inte att uppdatera samrådet.
           success: Samrådet har uppdaterats.
@@ -142,11 +142,8 @@ sv:
           success: Administratören har tagits bort från samrådet.
         edit:
           update: Uppdatera
-        index:
-          assembly_admins_title: Administratörer för samråd
         new:
           create: Skapa
-          title: Ny administratör av samråd
         update:
           error: Det gick inte att uppdatera administratör för samrådet.
           success: Administratören för samrådet har uppdaterats.
@@ -168,15 +165,15 @@ sv:
           components: Komponenter
           info: Om samrådet
           landing_page: Landningssida
+          members: Medlemmar
           moderations: Moderering
-          private_users: Medlemmar
           see_assembly: Visa samråd
       models:
         assembly:
           fields:
+            access_mode: Åtkomstläge
             actions: Åtgärder
             created_at: Skapad
-            private: Privat
             promoted: Utvald
             published: Publicerad
             title: Titel
@@ -203,9 +200,6 @@ sv:
       taxonomy_filters:
         space_filter_for:
           assemblies: Alla samråd
-      titles:
-        assemblies: Samråd
-        assemblies_types: Typer av samråd
       tooltips:
         deleted_assemblies_info: Ett samråd kan endast tas bort om status är "Avpublicerad".
     admin_log:
@@ -241,16 +235,21 @@ sv:
       admin:
         assemblies:
           form:
-            announcement_help: Den här texten visas direkt under informationen om samrådet.
+            access:
+              label: Åtkomst
+              options:
+                open: Alla kan se och delta i sammankomsten.
+                restricted: Endast medlemmar kan se och delta.
+                transparent: Alla kan se sammankomsten, men bara medlemmar kan delta.
             define_taxonomy_filters: Ställ in filter innan du använder den här inställningen.
             duration: Varaktighet
             duration_help: Välj ett slutdatum om samrådet är tidsbegränsat.
+            has_members_help: Du kommer att kunna skapa och publicera medlemmar
             images: Bilder
             included_at_help: Markera datumet när samrådet lades till på plattformen. Det behöver inte nödvändigtvis vara samma som datumet det skapades.
             metadata: Metadata
             no_taxonomy_filters_found: Inga filter för kategorier hittades.
             other: Övrigt
-            private_notice: Du kommer att kunna hantera medlemmar om samrådet gjorts privat
             select_a_created_by: Välj en skapad av
             select_parent_assembly: Välj överordnat samråd
             slug_help_html: 'URL-slugs används till att generera URL:er till samrådet. Använd bara bokstäver, siffror och bindestreck, och de måste börja med en bokstav. Exempel: %{url}'
@@ -275,7 +274,6 @@ sv:
             max_results: Maximalt antal element att visa
         imports:
           attachment_error: Bilagan "%{title}" kunde inte importeras (%{error}).
-          banner_image_error: Bannerbilden kunde inte importeras (%{error}).
           hero_image_error: Startbilden kunde inte importeras (%{error}).
         new_import:
           accepted_types:
@@ -304,9 +302,6 @@ sv:
           type: Typ
         show:
           title: Om det här samrådet
-      assembly_members:
-        index:
-          members: Medlemmar
       content_blocks:
         children_assemblies:
           name: Samråd
@@ -341,16 +336,9 @@ sv:
           highlighted_assemblies:
             active_spaces: Pågående samråd
             see_all_spaces: Visa alla samråd
-        user_profile:
-          member_of:
-            member_of: Medlem av
       show:
         duration: Varaktighet
-        private_space: Det här är ett privat samråd
         social_networks_title: Besök samrådet på
-    assembly_members:
-      index:
-        title: Medlemmar
     download_your_data:
       show:
         assemblies: Exportera samråd
@@ -377,18 +365,17 @@ sv:
       value_types:
         assembly_presenter:
           not_found: 'Samrådet hittades inte i databasen (ID: %{id})'
-        assembly_type_presenter:
-          not_found: 'Typen av samråd hittades inte i databasen (ID: %{id})'
     menu:
       assemblies: Samråd
     open_data:
       help:
         assemblies:
-          announcement: Meddelande
+          access_mode: Åtkomstläge. Huruvida sammankomsten är öppen, begränsad eller transparent.
           area: Samrådets område
           assembly_type: Typ av samråd
           closing_date: Slutdatum för samrådet
           closing_date_reason: Anledning till att samrådet avslutades
+          component_settings: Inställningar för samrådet
           composition: Samrådets sammansättning
           created_at: Datum när processen skapades
           created_by: Initiativtagare till samrådet

data/config/locales/tr-TR.yml

@@ -1,4 +1,3 @@
----
 tr:
   activemodel:
     attributes:
@@ -18,7 +17,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 +25,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ı
@@ -38,7 +37,6 @@ tr:
         participatory_processes_ids: İlgili Katılımcı süreçler
         participatory_scope: Karar nedir
         participatory_structure: Nasıl karar verilir
-        private_space: Özel alan
         promoted: Tanıtılan
         published_at: Yayınlandı
         purpose_of_action: Eylem amacı
@@ -88,12 +86,9 @@ tr:
         edit:
           update: Güncelle
         index:
-          private: Kişisel
-          public: Genel
           published: Yayınlanan
         new:
           create: Oluştur
-          title: Yeni kurul
         update:
           error: Bu kurul güncellenirken bir hata oluştu.
           success: Kurul başarıyla güncellendi.
@@ -119,11 +114,8 @@ tr:
           success: Yönetici bu kuruldan başarıyla kaldırıldı.
         edit:
           update: Güncelle
-        index:
-          assembly_admins_title: Kurul yöneticileri
         new:
           create: Oluştur
-          title: Yeni Meclis Yöneticisi
         update:
           error: Bu kurul için bir yönetici güncellenirken bir sorun oluştu.
           success: Yönetici bu kurul için başarıyla güncellendi.
@@ -138,12 +130,10 @@ tr:
           info: Bu meclis hakkında
           landing_page:
           moderations: Yönetim
-          private_users: Üyeler
       models:
         assembly:
           fields:
             created_at: Düzenlendi
-            private: Özel
             promoted: Vurgulanan
             published: Yayınlanan
             title: Başlık
@@ -165,9 +155,6 @@ tr:
             admin: Yönetici
             collaborator: İşbirlikçi
             moderator: Moderatör
-      titles:
-        assemblies: Kurullar
-        assemblies_types: Kurul türleri
       tooltips:
         deleted_assemblies_info: Bir meclis yalnızca eğer statüsü "Yayınlanmamış" ise silinebilir.
     admin_log:
@@ -225,9 +212,6 @@ tr:
         filters:
           names:
             all: Tümü
-      assembly_members:
-        index:
-          members: Üyeler
       content_blocks:
         highlighted_assemblies:
           name: Vurgulanan kurullar
@@ -247,16 +231,8 @@ tr:
         working_group: Çalışma Grubu
       index:
         title: Kurullar
-      pages:
-        user_profile:
-          member_of:
-            member_of: Üyesi
       show:
         duration: Süre
-        private_space: Bu özel bir kurul
-    assembly_members:
-      index:
-        title: Üyeler
     events:
       assemblies:
         create_assembly_member:
@@ -280,8 +256,6 @@ tr:
       value_types:
         assembly_presenter:
           not_found: 'Kurul veritabanında bulunamadı (ID: %{id})'
-        assembly_type_presenter:
-          not_found: 'Kurul türü veritabanında bulunamadı (ID: %{id})'
     menu:
       assemblies: Kurullar
     open_data:

data/config/locales/uk.yml

@@ -1,4 +1,3 @@
----
 uk:
   activemodel:
     attributes:
@@ -30,7 +29,6 @@ uk:
         participatory_processes_ids: Пов'язані рухи співучасті
         participatory_scope: Що вирішується
         participatory_structure: Як це вирішується
-        private_space: Приватний простір
         promoted: Висвітлено
         published_at: 'Оприлюднено:'
         purpose_of_action: Мета дії
@@ -80,12 +78,9 @@ uk:
         edit:
           update: Оновити
         index:
-          private: Приватні
-          public: Громадяни
           published: Оприлюднено
         new:
           create: Додати
-          title: Додати збори
         update:
           error: При спробі оновити ці збори сталася помилка.
           success: Збори успішно оновлено.
@@ -104,8 +99,6 @@ uk:
           success: Учасника цих зборів успішно видалено.
         edit:
           update: Оновити
-        index:
-          assembly_admins_title: Учасники зборів
         new:
           create: Створити
         update:
@@ -124,7 +117,6 @@ uk:
         assembly:
           fields:
             created_at: 'Додано:'
-            private: Приватні
             promoted: Висвітлено
             published: Оприлюднено
             title: Назва
@@ -146,8 +138,6 @@ uk:
             admin: Адміністратор
             collaborator: Співробітник
             moderator: Модератор
-      titles:
-        assemblies: Збори
     admin_log:
       assembly:
         create: "%{user_name} додав збори %{resource_name}"
@@ -183,13 +173,8 @@ uk:
         public: Громадяни
       index:
         title: Збори
-      pages:
-        user_profile:
-          member_of:
-            member_of: 'Входить у склад:'
       show:
         duration: Тривалість
-        private_space: Це приватні збори
     log:
       value_types:
         assembly_presenter:

data/config/locales/zh-CN.yml

@@ -1,4 +1,3 @@
----
 zh-CN:
   activemodel:
     attributes:
@@ -31,7 +30,6 @@ zh-CN:
         participatory_processes_ids: 相关的参与进程
         participatory_scope: 决定的内容
         participatory_structure: 如何决定
-        private_space: 私有空间
         promoted: 高亮
         published_at: 发布于
         purpose_of_action: 行动的目的
@@ -73,12 +71,9 @@ zh-CN:
         edit:
           update: 更新
         index:
-          private: 非公开的
-          public: 公开的
           published: 已发布
         new:
           create: 创建
-          title: 新建程序集
         update:
           error: 更新这个组件时出现问题。
           success: 程序更新成功。
@@ -104,8 +99,6 @@ zh-CN:
           success: 管理员已成功从此组件中移除。
         edit:
           update: 更新
-        index:
-          assembly_admins_title: 集合管理员
         new:
           create: 创建
         update:
@@ -120,12 +113,10 @@ zh-CN:
           attachments: 附件
           components: 组件
           moderations: 版面
-          private_users: 成员
       models:
         assembly:
           fields:
             created_at: 创建于
-            private: 非公开的
             promoted: 高亮
             published: 已发布
             title: 标题
@@ -147,9 +138,6 @@ zh-CN:
             admin: 管理员
             collaborator: 协作者
             moderator: 版主
-      titles:
-        assemblies: 程序集
-        assemblies_types: 程序集类型
     admin_log:
       assembly:
         create: "%{user_name} 创建了 %{resource_name} 程序集"
@@ -194,9 +182,6 @@ zh-CN:
         filters:
           names:
             all: 所有的
-      assembly_members:
-        index:
-          members: 成员
       content_blocks:
         highlighted_assemblies:
           name: 突出显示的会议
@@ -216,16 +201,8 @@ zh-CN:
         working_group: 工作组
       index:
         title: 程序集
-      pages:
-        user_profile:
-          member_of:
-            member_of: 成员
       show:
         duration: 期限
-        private_space: 这是一个私人装饰
-    assembly_members:
-      index:
-        title: 成员
     events:
       assemblies:
         create_assembly_member:
@@ -248,8 +225,6 @@ zh-CN:
       value_types:
         assembly_presenter:
           not_found: '在数据库中找不到程序集 (ID: %{id})'
-        assembly_type_presenter:
-          not_found: '在数据库中找不到程序集类型 (ID: %{id})'
     menu:
       assemblies: 程序集
     participatory_processes:

data/config/locales/zh-TW.yml

@@ -1,4 +1,3 @@
----
 zh-TW:
   activemodel:
     attributes:
@@ -36,7 +35,6 @@ zh-TW:
         participatory_processes_ids: 相關參與程序
         participatory_scope: 決定了什麼
         participatory_structure: 如何決定
-        private_space: 私人空間
         promoted: 重點顯示
         published_at: 發佈於
         purpose_of_action: 行動目的
@@ -88,12 +86,9 @@ zh-TW:
         edit:
           update: 更新
         index:
-          private: 不公開
-          public: 公開
           published: 已發佈
         new:
           create: 創建
-          title: 新大會
         update:
           error: 更新此大會時出現問題
           success: 此大會成功更新
@@ -119,8 +114,6 @@ zh-TW:
           success: 管理員已成功從此大會中刪除
         edit:
           update: 更新
-        index:
-          assembly_admins_title: 大會管理員
         new:
           create: 建立
         update:
@@ -135,12 +128,10 @@ zh-TW:
           attachments: 附件
           components: 元件
           moderations: 版主
-          private_users: 成員
       models:
         assembly:
           fields:
             created_at: 建立於
-            private: 不公開
             promoted: 重點顯示
             published: 已發佈
             title: 標題
@@ -162,9 +153,6 @@ zh-TW:
             admin: 管理員
             collaborator: 合作者
             moderator: 版主
-      titles:
-        assemblies: 大會
-        assemblies_types: 大會類型
     admin_log:
       assembly:
         create: "%{user_name} 建立了 %{resource_name} 大會"
@@ -194,7 +182,6 @@ zh-TW:
       admin:
         assemblies:
           form:
-            announcement_help: 您在此處輸入的文字將顯示至使用者的正下方大會信息
             duration: 持續時間
             duration_help: 如果此大會的持續時間有限，請選擇結束日期。 否則，它將顯示為不確定。
             images: 圖片
@@ -224,9 +211,6 @@ zh-TW:
             all: 全部
         show:
           title: 關於這個大會
-      assembly_members:
-        index:
-          members: 成員
       content_blocks:
         highlighted_assemblies:
           name: 關注的大會
@@ -248,17 +232,9 @@ zh-TW:
         title: 大會
       last_activity:
         new_assembly: '新大會:'
-      pages:
-        user_profile:
-          member_of:
-            member_of: 的成員
       show:
         duration: 持續時間
-        private_space: 這是一個私人大會
         social_networks_title: 訪問大會
-    assembly_members:
-      index:
-        title: 成員
     events:
       assemblies:
         create_assembly_member:
@@ -282,8 +258,6 @@ zh-TW:
       value_types:
         assembly_presenter:
           not_found: '在資料庫中找不到該大會 (ID: %{id})'
-        assembly_type_presenter:
-          not_found: '在資料庫中找不到該大會類型 (ID: %{id})'
     menu:
       assemblies: 大會
     participatory_processes:

data/db/data/20260104094930_remove_assemblies_types_references.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class RemoveAssembliesTypesReferences < ActiveRecord::Migration[7.2]
+  class ActionLog < ApplicationRecord
+    self.table_name = :decidim_action_logs
+  end
+
+  class Version < ApplicationRecord
+    self.table_name = "versions"
+  end
+
+  class Notification < ApplicationRecord
+    self.table_name = "decidim_notifications"
+  end
+
+  def up
+    ActionLog.where(resource_type: "Decidim::AssembliesType").delete_all
+    Version.where(item_type: "Decidim::AssembliesType").delete_all
+    Notification.where(decidim_resource_type: "Decidim::AssembliesType").delete_all
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/data/20260111185230_replace_legacy_fields_to_access_mode_for_assemblies.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class ReplaceLegacyFieldsToAccessModeForAssemblies < ActiveRecord::Migration[7.2]
+  def up
+    say_with_time "Backfilling assemblies access_mode from legacy flags" do
+      Decidim::Assembly.reset_column_information
+      Decidim::Assembly.find_each do |assembly|
+        mode = if assembly.private_space && !assembly.is_transparent
+                 :restricted
+               elsif assembly.private_space && assembly.is_transparent
+                 :transparent
+               else
+                 :open
+               end
+        # Use write_attribute to avoid validations/callbacks
+        assembly.write_attribute(:access_mode, Decidim::Assembly.access_modes[mode])
+        assembly.save!(validate: false)
+      end
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/data/20260210195653_move_announcement_to_content_block_on_assemblies.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+class MoveAnnouncementToContentBlockOnAssemblies < ActiveRecord::Migration[7.2]
+  class Assembly < ApplicationRecord
+    self.table_name = "decidim_assemblies"
+  end
+
+  class ContentBlock < ApplicationRecord
+    self.table_name = "decidim_content_blocks"
+  end
+
+  def up
+    Assembly.find_each do |assembly|
+      announcement = assembly.announcement
+      next if announcement.blank? || announcement == {}
+
+      content_block = ContentBlock.find_or_initialize_by(
+        decidim_organization_id: assembly.decidim_organization_id,
+        scope_name: :assembly_homepage,
+        manifest_name: :announcement,
+        scoped_resource_id: assembly.id
+      )
+
+      settings = announcement.each_with_object({}) do |(locale, value), acc|
+        next if locale.to_s == "machine_translations"
+
+        acc["announcement_#{locale}"] = value
+      end
+
+      next if settings.empty?
+
+      content_block.settings = (content_block.settings || {}).merge(settings)
+      content_block.save!
+    end
+  end
+
+  def down
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20180226103942_add_parent_child_relation_to_assemblies.rb

@@ -7,10 +7,10 @@ class AddParentChildRelationToAssemblies < ActiveRecord::Migration[5.1]
         # required so that test suite works in ci env
         enable_extension "ltree"
       rescue StandardError
-        raise <<-MSG.squish
-        Decidim requires the ltree extension to be enabled in your PostgreSQL.
-        You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
-        super user.
+        raise <<~MSG.squish
+          Decidim requires the ltree extension to be enabled in your PostgreSQL.
+          You can do so by running `CREATE EXTENSION IF NOT EXISTS "ltree";` on the current DB as a PostgreSQL
+          super user.
         MSG
       end
     end

data/db/migrate/20190215093700_reset_negative_children_count_counters.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 class ResetNegativeChildrenCountCounters < ActiveRecord::Migration[5.2]
+  class Assembly < ApplicationRecord
+    self.table_name = :decidim_assemblies
+  end
+
   def change
-    ids = Decidim::Assembly.unscoped.where("children_count < 0").pluck(:id)
-    ids.each { |id| Decidim::Assembly.unscoped.reset_counters(id, :children_count) }
+    ids = Assembly.unscoped.where("children_count < 0").pluck(:id)
+    ids.each { |id| Assembly.unscoped.reset_counters(id, :children_count) }
   end
 end

data/db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 class AddFollowableCounterCacheToAssemblies < ActiveRecord::Migration[5.2]
+  class Assembly < ApplicationRecord
+    self.table_name = :decidim_assemblies
+  end
+
   def change
     add_column :decidim_assemblies, :follows_count, :integer, null: false, default: 0, index: true
 
     reversible do |dir|
       dir.up do
-        Decidim::Assembly.reset_column_information
-        Decidim::Assembly.unscoped.find_each do |record|
+        Assembly.reset_column_information
+        Assembly.unscoped.find_each do |record|
           record.class.reset_counters(record.id, :follows)
         end
       end

data/db/migrate/20251112114736_remove_legacy_images_from_assemblies_module.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class RemoveLegacyImagesFromAssembliesModule < ActiveRecord::Migration[7.2]
+  def change
+    remove_column :decidim_assemblies, :hero_image, :string
+    remove_column :decidim_assemblies, :banner_image, :string
+  end
+end

data/db/migrate/20251205120000_add_has_members_to_decidim_assemblies.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddHasMembersToDecidimAssemblies < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_assemblies, :has_members, :boolean, default: false
+  end
+end