decidim-assemblies 0.28.5 → 0.29.0.rc1

data/config/locales/uk.yml

@@ -2,8 +2,6 @@
 uk:
   activemodel:
     attributes:
-      assemblies_type:
-        title: Назва
       assembly:
         area_id: Дільниця
         assembly_type: Різновид зборів
@@ -45,7 +43,6 @@ uk:
         scope_id: Обсяг
         scopes_enabled: Обсяги увімкнено
         short_description: Стислий опис
-        show_statistics: Показувати статистику
         slug: Скорочена веб-адреса
         special_features: Особливості
         subtitle: Підзаголовок
@@ -150,9 +147,6 @@ uk:
         update:
           error: При спробі оновити учасника цих зборів сталася помилка.
           success: Учасника цих зборів успішно оновлено.
-      filters:
-        decidim_assemblies_type_id_eq:
-          label: Різновид зборів
       menu:
         assemblies: Збори
         assemblies_submenu:
@@ -244,7 +238,12 @@ uk:
           members: Члени президії
       assembly_types:
         commission: Робочий гурт
+        consultative_advisory: Дорадчі / Консультативні
+        executive: Виконавчі
+        government: Урядові
         others: Інші
+        participatory: Співучасні
+        working_group: Робочий гурт
       content_blocks:
         highlighted_assemblies:
           name: Висвітлені збори
@@ -261,11 +260,7 @@ uk:
       show:
         assembly_type: Різновид зборів
         duration: Тривалість
-        is_transparent:
-          'false': непрозорі
-          'true': прозорі
         private_space: Це приватні збори
-        related_participatory_processes: Пов'язані рухи співучасті
     assembly_members:
       assembly_member:
         designated_on: 'Надано повноваження:'

data/config/locales/zh-CN.yml

@@ -2,8 +2,6 @@
 zh-CN:
   activemodel:
     attributes:
-      assemblies_type:
-        title: 标题
       assembly:
         area_id: 区域
         assembly_type: 程序集类型
@@ -46,7 +44,6 @@ zh-CN:
         scope_id: 范围
         scopes_enabled: 范围已启用
         short_description: 简短描述
-        show_statistics: 显示统计
         slug: URL 名称
         special_features: 特殊功能
         subtitle: 字幕
@@ -161,9 +158,6 @@ zh-CN:
         update:
           error: 更新这个会议的管理员时出现问题。
           success: 管理员已成功更新此程序集。
-      filters:
-        decidim_assemblies_type_id_eq:
-          label: 程序集类型
       menu:
         assemblies: 程序集
         assemblies_submenu:
@@ -306,11 +300,7 @@ zh-CN:
       show:
         assembly_type: 程序集类型
         duration: 期限
-        is_transparent:
-          'false': 不透明度
-          'true': 透明度
         private_space: 这是一个私人装饰
-        related_participatory_processes: 相关的参与进程
     assembly_members:
       assembly_member:
         designated_on: 指定于

data/config/locales/zh-TW.yml

@@ -51,7 +51,6 @@ zh-TW:
         scope_id: 範圍
         scopes_enabled: 啟用範圍
         short_description: 簡短說明
-        show_statistics: 顯示統計資料
         slug: URL名稱
         special_features: 特殊功能
         subtitle: 子標題
@@ -150,7 +149,7 @@ zh-TW:
         index:
           assembly_members_title: 大會成員
         new:
-          create: 創建
+          create: 建立
         update:
           error: 更新此大會的成員時出現問題。
           success: 此大會的成員已成功更新。
@@ -280,7 +279,6 @@ zh-TW:
           form:
             existing_user: 現有參與者
             explanation: '圖像的指導'
-            image_guide: 最好是沒有任何文字的肖像圖像
             non_user: 非參與者
             non_user_avatar_help: 在發佈他們為會員之前，您應該徵得他們的同意
             select_a_position: 選擇一個位置
@@ -337,11 +335,7 @@ zh-TW:
       show:
         assembly_type: 大會類型
         duration: 持續時間
-        is_transparent:
-          'false': 不透明
-          'true': 透明
         private_space: 這是一個私人大會
-        related_participatory_processes: 相關參與程序
         social_networks_title: 訪問大會
     assembly_members:
       assembly_member:

data/db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class ChangeShowStatisticsFromDecidimAssemblies < ActiveRecord::Migration[7.0]
+  def up
+    change_column_default :decidim_assemblies, :show_statistics, from: false, to: true
+  end
+
+  def down
+    change_column_default :decidim_assemblies, :show_statistics, from: true, to: false
+  end
+end

data/decidim-assemblies.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Assemblies.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]
-  s.license = "AGPL-3.0-or-later"
+  s.license = "AGPL-3.0"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.1.0"
+  s.required_ruby_version = "~> 3.2.0"
 
   s.name = "decidim-assemblies"
   s.summary = "Decidim assemblies module"

data/lib/decidim/api/assembly_type.rb

@@ -31,7 +31,6 @@ module Decidim
       field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly", null: true
       field :participatory_scope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", null: true
       field :participatory_structure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", null: true
-      field :show_statistics, Boolean, "If this assembly should show statistics", null: true
       field :scopes_enabled, Boolean, "If this assembly has scopes enabled", null: true
       field :private_space, Boolean, "If this assembly is a private space", null: true
       field :area, Decidim::Core::AreaApiType, "Area of this assembly", null: true
@@ -54,19 +53,19 @@ module Decidim
       field :twitter_handler, String, "Twitter handler", null: true
       field :instagram_handler, String, "Instagram handler", null: true
       field :facebook_handler, String, "Facebook handler", null: true
-      field :youtube_handler, String, "Youtube handler", null: true
-      field :github_handler, String, "Github handler", null: true
+      field :youtube_handler, String, "YouTube handler", null: true
+      field :github_handler, String, "GitHub handler", null: true
       field :announcement, Decidim::Core::TranslatedFieldType, "Highlighted announcement for this assembly", null: true
 
       field :members, [Decidim::Assemblies::AssemblyMemberType, { null: true }], "Members of this assembly", null: false
-      field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Childrens of this assembly", null: false
+      field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Children of this assembly", null: false
 
       def hero_image
-        object.attached_uploader(:hero_image).url
+        object.attached_uploader(:hero_image).path
       end
 
       def banner_image
-        object.attached_uploader(:banner_image).url
+        object.attached_uploader(:banner_image).path
       end
     end
   end

data/lib/decidim/assemblies/content_blocks/registry_manager.rb

@@ -82,7 +82,7 @@ module Decidim
             content_block.public_name_key = "decidim.content_blocks.last_activity.name"
             content_block.settings_form_cell = "decidim/content_blocks/last_activity_settings_form"
             content_block.settings do |settings|
-              settings.attribute :max_last_activity_users, type: :integer, default: Decidim::ContentBlocks::ParticipatorySpaceLastActivityCell::DEFAULT_MAX_LAST_ACTIVITY_USERS
+              settings.attribute :max_last_activity_users, type: :integer, default: Decidim.default_max_last_activity_users
             end
           end
 

data/lib/decidim/assemblies/engine.rb

@@ -60,6 +60,7 @@ module Decidim
 
       initializer "decidim_assemblies.menu" do
         Decidim::Assemblies::Menu.register_menu!
+        Decidim::Assemblies::Menu.register_mobile_menu!
         Decidim::Assemblies::Menu.register_home_content_block_menu!
       end
 

data/lib/decidim/assemblies/menu.rb

@@ -14,6 +14,17 @@ module Decidim
         end
       end
 
+      def self.register_mobile_menu!
+        Decidim.menu :mobile_menu do |menu|
+          menu.add_item :assemblies,
+                        I18n.t("menu.assemblies", scope: "decidim"),
+                        decidim_assemblies.assemblies_path,
+                        position: 2.2,
+                        if: OrganizationPublishedAssemblies.new(current_organization, current_user).any?,
+                        active: :inclusive
+        end
+      end
+
       def self.register_home_content_block_menu!
         Decidim.menu :home_content_block_menu do |menu|
           menu.add_item :assemblies,

data/lib/decidim/assemblies/seeds.rb

@@ -111,17 +111,7 @@ module Decidim
         # Create users with specific roles
         Decidim::AssemblyUserRole::ROLES.each do |role|
           email = "assembly_#{assembly.id}_#{role}@example.org"
-
-          user = Decidim::User.find_or_initialize_by(email:)
-          user.update!(
-            name: ::Faker::Name.name,
-            nickname: ::Faker::Twitter.unique.screen_name,
-            password: "decidim123456789",
-            organization:,
-            confirmed_at: Time.current,
-            locale: I18n.default_locale,
-            tos_agreement: true
-          )
+          user = find_or_initialize_user_by(email:)
 
           Decidim::AssemblyUserRole.find_or_create_by!(
             user:,

data/lib/decidim/assemblies/test/factories.rb

@@ -35,7 +35,6 @@ FactoryBot.define do
     target { generate_localized_title(:assembly_target, skip_injection:) }
     participatory_scope { generate_localized_title(:assembly_participatory_scope, skip_injection:) }
     participatory_structure { generate_localized_title(:assembly_participatory_structure, skip_injection:) }
-    show_statistics { true }
     private_space { false }
     purpose_of_action { generate_localized_description(:assembly_purpose_of_action, skip_injection:) }
     composition { generate_localized_description(:assembly_composition, skip_injection:) }

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.5"
+      "0.29.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.28.5
+  version: 0.29.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2024-07-16 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.5
+        version: 0.29.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.5
+        version: 0.29.0.rc1
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -121,7 +121,6 @@ files:
 - app/commands/decidim/assemblies/admin/create_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_member.rb
-- app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb
 - app/commands/decidim/assemblies/admin/destroy_assembly_member.rb
 - app/commands/decidim/assemblies/admin/import_assembly.rb
 - app/commands/decidim/assemblies/admin/update_assemblies_type.rb
@@ -248,15 +247,12 @@ files:
 - app/views/layouts/decidim/admin/assemblies_imports.html.erb
 - app/views/layouts/decidim/admin/assemblies_types.html.erb
 - app/views/layouts/decidim/admin/assembly.html.erb
-- app/views/layouts/decidim/assembly.html.erb
 - config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
 - config/locales/bg-BG.yml
 - config/locales/bg.yml
-- config/locales/bn-BD.yml
-- config/locales/bs-BA.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
@@ -354,6 +350,7 @@ files:
 - db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb
 - db/migrate/20210507063604_add_announcement_to_assemblies.rb
 - db/migrate/20210907120249_remove_designation_mode_from_assembly_members.rb
+- db/migrate/20240712061153_change_show_statistics_from_decidim_assemblies.rb
 - decidim-assemblies.gemspec
 - lib/decidim/api/assemblies_type_type.rb
 - lib/decidim/api/assembly_member_type.rb
@@ -372,7 +369,7 @@ files:
 - lib/decidim/assemblies/version.rb
 homepage: https://decidim.org
 licenses:
-- AGPL-3.0-or-later
+- AGPL-3.0
 metadata:
   bug_tracker_uri: https://github.com/decidim/decidim/issues
   documentation_uri: https://docs.decidim.org/
@@ -387,14 +384,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Decidim assemblies module

data/app/commands/decidim/assemblies/admin/destroy_assemblies_type.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Assemblies
-    module Admin
-      # A command with all the business logic when destroying an assembly
-      # type in the system.
-      class DestroyAssembliesType < Decidim::Command
-        # Public: Initializes the command.
-        #
-        # assemblies_type - the AssemblyMember to destroy
-        # current_user - the user performing the action
-        def initialize(assemblies_type, current_user)
-          @assemblies_type = assemblies_type
-          @current_user = current_user
-        end
-
-        # Executes the command. Broadcasts these events:
-        #
-        # - :ok when everything is valid.
-        # - :invalid if the form was not valid and we could not proceed.
-        #
-        # Returns nothing.
-        def call
-          destroy_assembly_type!
-          broadcast(:ok)
-        end
-
-        private
-
-        attr_reader :current_user
-
-        def destroy_assembly_type!
-          Decidim.traceability.perform_action!(
-            "delete",
-            @assemblies_type,
-            current_user
-          ) do
-            @assemblies_type.destroy!
-          end
-        end
-      end
-    end
-  end
-end

data/app/views/layouts/decidim/assembly.html.erb

@@ -1,18 +0,0 @@
-<% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
-<% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
-<% add_decidim_meta_tags(
-  image_url: current_participatory_space.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_participatory_space.short_description)
-) %>
-
-<%= append_javascript_pack_tag "decidim_assemblies" %>
-
-<%= render partial: "layouts/decidim/header/follow_space_menu_bar_button", locals: { participatory_space: current_participatory_space } %>
-
-<%= render "layouts/decidim/application" do %>
-  <main>
-    <%= yield %>
-  </main>
-<% end %>
-
-<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>

data/config/locales/bn-BD.yml

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

data/config/locales/bs-BA.yml

@@ -1,44 +0,0 @@
----
-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})'