decidim-assemblies 0.31.8 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 834c37a80060af9ef0ae034c1b6d1c70a4be1d683d88ce0b7dfcdba71a0306c1
-  data.tar.gz: eec0950f3a0b1dc4df44248647ec0194c29fe5451f94ecdcba674dfb6539861c
+  metadata.gz: e281f489f7f47da21acec28d2771d799f6a46de0d0ca7fb34d1a6e4f9baa8a32
+  data.tar.gz: 3b173a11dc651d6dececd6c9c05022365e85f91e406abd0ba1b06d4e0c5e079e
 SHA512:
-  metadata.gz: 7ea29cb86748c9ffd6f3f03e5a35f7241a7e82d31fa29475443421545367c96b7c5a7338cb0575c87a252d2fbe5b934ee72e4abf67d5d1d1c50c3672355fc5ef
-  data.tar.gz: 879d9eeb1d3d477447098b53e82fc72423c4f340a4c00d2ba189fd57b289abacba6aa435348657c40b93be298fbd7d8f3bee44396dd4c82cf1a75448a90aa738
+  metadata.gz: 1a2e340210186d6225909ff074fae66f02b153cc63808ff8d14ae2d723be1d1a3acf02e95962869e2f2f1250d83cb608b3953801170e6fc60e3d60255f919328
+  data.tar.gz: 4f334da82cd6ce0ddb35b3a7a51c6bf2efb00a3b301f8e413db1a5d6d308861f04cef4f2da55870fb39536960c765e157b3bf04484d4d1bead3188790e26dc5b

data/README.md

@@ -1,4 +1,4 @@
-# Decidim::Assemblies
+# decidim-assemblies
 
 Assemblies are the permanent Decidim's participatory space. They are always
 "active" so unlike participatory processes, they have no steps or phases.
@@ -15,19 +15,11 @@ This module provides:
 
 * Public views for assembly via a high level section in the main menu.
 
-## Installation
-
-Add this line to your application's Gemfile:
+You can see the documentation of this feature at the [Decidim Documentation](https://docs.decidim.org/en/develop/admin/spaces/assemblies).
 
-```ruby
-gem 'decidim-assemblies'
-```
-
-And then execute:
+## Installation
 
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this participatory space.
 
 ## Contributing
 

data/app/cells/decidim/assemblies/content_blocks/main_data_cell.rb

@@ -7,6 +7,7 @@ module Decidim
         include AssembliesHelper
         include Decidim::ComponentPathHelper
         include ActiveLinkTo
+        include Decidim::ActiveLinkToHelper
 
         EXTRA_ATTRIBUTES = %w(purpose_of_action internal_organisation composition).freeze
 

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

@@ -6,15 +6,15 @@ module Decidim
       # A command with all the business logic when creating a new assembly
       # in the system.
       class CreateAssembly < Decidim::Commands::CreateResource
-        fetch_file_attributes :hero_image, :banner_image
+        fetch_file_attributes :hero_image
 
         fetch_form_attributes :title, :subtitle, :weight, :slug, :description, :short_description,
-                              :promoted, :taxonomizations, :parent, :announcement, :organization,
-                              :private_space, :developer_group, :local_area, :target, :participatory_scope,
+                              :promoted, :taxonomizations, :parent, :organization,
+                              :access_mode, :developer_group, :local_area, :target, :participatory_scope,
                               :participatory_structure, :meta_scope, :purpose_of_action,
                               :composition, :creation_date, :created_by, :created_by_other,
                               :duration, :included_at, :closing_date, :closing_date_reason, :internal_organisation,
-                              :is_transparent, :special_features, :twitter_handler, :facebook_handler,
+                              :has_members, :special_features, :twitter_handler, :facebook_handler,
                               :instagram_handler, :youtube_handler, :github_handler
 
         protected

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

@@ -29,8 +29,8 @@ module Decidim
             Assembly.transaction do
               duplicate_assembly
               duplicate_assembly_attachments
-              duplicate_landing_page_blocks
               duplicate_assembly_components if @form.duplicate_components?
+              duplicate_landing_page_blocks if @form.duplicate_landing_page_blocks?
             end
           end
 
@@ -58,13 +58,12 @@ module Decidim
             participatory_scope: @assembly.participatory_scope,
             participatory_structure: @assembly.participatory_structure,
             meta_scope: @assembly.meta_scope,
-            announcement: @assembly.announcement,
             taxonomies: @assembly.taxonomies
           )
         end
 
         def duplicate_assembly_attachments
-          [:hero_image, :banner_image].each do |attribute|
+          [:hero_image].each do |attribute|
             next unless @assembly.attached_uploader(attribute).attached?
 
             @duplicated_assembly.send(attribute).attach(@assembly.send(attribute).blob)

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

@@ -6,14 +6,14 @@ module Decidim
       # A command with all the business logic when updating a new assembly
       # in the system.
       class UpdateAssembly < Decidim::Commands::UpdateResource
-        fetch_file_attributes :hero_image, :banner_image
+        fetch_file_attributes :hero_image
 
         fetch_form_attributes :title, :subtitle, :slug, :promoted, :description, :short_description,
-                              :taxonomizations, :parent, :private_space, :developer_group, :local_area,
+                              :taxonomizations, :parent, :access_mode, :developer_group, :local_area,
                               :target, :participatory_scope, :participatory_structure, :meta_scope,
                               :purpose_of_action, :composition, :creation_date, :created_by,
                               :created_by_other, :duration, :included_at, :closing_date, :closing_date_reason,
-                              :internal_organisation, :is_transparent, :special_features, :twitter_handler, :announcement,
+                              :internal_organisation, :has_members, :special_features, :twitter_handler,
                               :facebook_handler, :instagram_handler, :youtube_handler, :github_handler, :weight
 
         private

data/app/controllers/concerns/decidim/assemblies/admin/filterable.rb

@@ -25,15 +25,19 @@ module Decidim
           end
 
           def filters
-            [:private_space_eq, :published_at_null]
+            [:with_any_access_mode, :published_at_null]
           end
 
           def filters_with_values
             {
-              private_space_eq: [true, false],
+              with_any_access_mode: access_modes,
               published_at_null: [true, false]
             }
           end
+
+          def access_modes
+            Assembly::ACCESS_MODES.keys
+          end
         end
       end
     end

data/app/controllers/concerns/decidim/assemblies/assembly_breadcrumb.rb

@@ -12,14 +12,11 @@ module Decidim
         return {} if current_participatory_space.blank?
         return super unless current_participatory_space.is_a?(Decidim::Assembly)
 
-        dropdown_cell = current_participatory_space_manifest.breadcrumb_cell
-
         items = current_participatory_space.ancestors.map do |participatory_space|
           {
             label: participatory_space.title,
             url: Decidim::ResourceLocatorPresenter.new(participatory_space).path,
             active: false,
-            dropdown_cell:,
             resource: participatory_space
           }
         end

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

@@ -37,7 +37,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assemblies.create.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end
@@ -63,7 +63,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assemblies.update.error", scope: "decidim.admin")
-              render :edit, layout: "decidim/admin/assembly", status: :unprocessable_entity
+              render :edit, layout: "decidim/admin/assembly", status: :unprocessable_content
             end
           end
         end

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

@@ -10,8 +10,6 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachmentCollections
         include Decidim::Admin::Concerns::HasTabbedMenu
 
-        protected
-
         def after_destroy_path
           assembly_attachment_collections_path(current_assembly)
         end

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

@@ -11,8 +11,6 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachments
         include Decidim::Admin::Concerns::HasTabbedMenu
 
-        protected
-
         def after_destroy_path
           assembly_attachments_path(current_assembly)
         end

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

@@ -25,7 +25,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assemblies_duplicates.create.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end

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

@@ -7,8 +7,6 @@ module Decidim
         include Concerns::AssemblyAdmin
         include Decidim::Admin::ParticipatorySpaceExport
 
-        protected
-
         def exportable_space
           current_assembly
         end

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

@@ -24,7 +24,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("assembly_imports.create.error", scope: "decidim.admin")
-              render :new, status: :unprocessable_entity
+              render :new, status: :unprocessable_content
             end
           end
         end

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

@@ -10,18 +10,12 @@ module Decidim
 
         layout "decidim/admin/assembly"
 
-        helper_method :scoped_resource
-
-        def scoped_resource
-          current_participatory_space
-        end
-
-        protected
-
         def content_block_scope
           current_participatory_space_manifest.content_blocks_scope_name
         end
 
+        alias scoped_resource current_participatory_space
+
         def enforce_permission_to_update_resource
           enforce_permission_to :update, :assembly, assembly: scoped_resource
         end

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

@@ -9,8 +9,6 @@ module Decidim
       class AssemblyShareTokensController < Decidim::Admin::ShareTokensController
         include Concerns::AssemblyAdmin
 
-        protected
-
         def resource
           current_assembly
         end

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

@@ -8,8 +8,6 @@ module Decidim
       class AssemblyUserRolesController < Decidim::Admin::ParticipatorySpace::UserRoleController
         include Concerns::AssemblyAdmin
 
-        protected
-
         def authorization_scope = :assembly_user_role
 
         def resource_form = form(AssemblyUserRoleForm)

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

@@ -9,8 +9,6 @@ module Decidim
       class ComponentShareTokensController < Decidim::Admin::ShareTokensController
         include Concerns::AssemblyAdmin
 
-        protected
-
         def resource
           @resource ||= current_participatory_space.components.find(params[:component_id])
         end

data/app/controllers/decidim/assemblies/admin/concerns/assembly_admin.rb

@@ -20,21 +20,19 @@ module Decidim
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
 
-            helper_method :current_assembly, :current_participatory_space
+            helper_method :current_assembly
             add_breadcrumb_item_from_menu :admin_assembly_menu
 
             participatory_space_admin_layout
 
-            def current_participatory_space = current_assembly
-
-            protected
-
             def current_assembly
               @current_assembly ||= organization_assemblies.find_by!(
                 slug: params[:assembly_slug] || params[:slug]
               )
             end
 
+            alias_method :current_participatory_space, :current_assembly
+
             def organization_assemblies
               @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
             end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows managing assembly members
+      # on assemblies
+      class MembersController < Decidim::Assemblies::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::ParticipatorySpace::Concerns::HasMembers
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows importing assembly members
+      # on assemblies
+      class MembersCsvImportsController < Decidim::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::ParticipatorySpace::Concerns::HasMembersCsvImport
+
+        def after_import_path
+          members_path(current_assembly)
+        end
+
+        def participatory_space
+          current_assembly
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/{participatory_space_private_users_controller.rb → members_controller.rb}

@@ -2,15 +2,13 @@
 
 module Decidim
   module Assemblies
-    class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::ApplicationController
+    class MembersController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
-      include Decidim::HasMembersPage
-      include Paginable
+      include Decidim::ParticipatorySpace::HasMembersPage
 
       def index
         raise ActionController::RoutingError, "No members for this assembly" if members.none?
 
-        @members = paginate(members)
         enforce_permission_to :list, :members
         redirect_to decidim_assemblies.assembly_path(current_participatory_space) unless can_visit_index?
       end
@@ -24,13 +22,6 @@ module Decidim
           OrganizationAssemblies.new(current_organization).query.where(id: params[:assembly_slug])
         ).first!
       end
-
-      def page_params
-        {
-          per_page:,
-          page: params[:page]
-        }
-      end
     end
   end
 end

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

@@ -15,6 +15,7 @@ module Decidim
 
         attribute :slug, String
         attribute :duplicate_components, Boolean
+        attribute :duplicate_landing_page_blocks, Boolean
 
         validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true
@@ -23,7 +24,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationAssemblies.new(current_organization).query.with_deleted.where(slug:).where.not(id:).any?
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

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

@@ -31,7 +31,6 @@ module Decidim
         translatable_attribute :subtitle, String
         translatable_attribute :target, String
         translatable_attribute :title, String
-        translatable_attribute :announcement, Decidim::Attributes::RichText
 
         attribute :created_by, String
         attribute :facebook_handler, String
@@ -45,18 +44,16 @@ module Decidim
         attribute :participatory_processes_ids, Array[Integer]
         attribute :weight, Integer, default: 0
 
-        attribute :is_transparent, Boolean
+        attribute :access_mode, String, default: :open
+        attribute :has_members, Boolean
         attribute :promoted, Boolean
-        attribute :private_space, Boolean
 
         attribute :closing_date, Decidim::Attributes::LocalizedDate
         attribute :creation_date, Decidim::Attributes::LocalizedDate
         attribute :duration, Decidim::Attributes::LocalizedDate
         attribute :included_at, Decidim::Attributes::LocalizedDate
 
-        attribute :banner_image
         attribute :hero_image
-        attribute :remove_banner_image, Boolean, default: false
         attribute :remove_hero_image, Boolean, default: false
 
         validates :parent, presence: true, if: ->(form) { form.parent.present? }
@@ -69,11 +66,13 @@ module Decidim
         validates :created_by_other, translatable_presence: true, if: ->(form) { form.created_by == "others" }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
-        validates :banner_image, passthru: { to: Decidim::Assembly }
         validates :hero_image, passthru: { to: Decidim::Assembly }
 
         validates :weight, presence: true
 
+        validates :access_mode, presence: true, inclusion: { in: Decidim::Assembly.access_modes.keys }
+        validate :ensure_access_mode_for_has_members
+
         alias organization current_organization
 
         def participatory_space_manifest
@@ -119,13 +118,16 @@ module Decidim
 
         def slug_uniqueness
           return unless organization_assemblies
-                        .with_deleted
                         .where(slug:)
                         .where.not(id: context[:assembly_id])
                         .any?
 
           errors.add(:slug, :taken)
         end
+
+        def ensure_access_mode_for_has_members
+          self.access_mode = :open if has_members == false
+        end
       end
     end
   end

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.with_deleted.where(slug:).where.not(id:).any?
+          return unless OrganizationAssemblies.new(current_organization).query.where(slug:).where.not(id:).any?
 
           errors.add(:slug, :taken)
         end

data/app/helpers/decidim/assemblies/assemblies_helper.rb

@@ -23,14 +23,14 @@ module Decidim
           *(if participatory_space.members_public_page?
               [{
                 name: t("assembly_member_menu_item", scope: "layouts.decidim.assembly_navigation"),
-                url: decidim_assemblies.assembly_participatory_space_private_users_path(participatory_space),
-                active: is_active_link?(decidim_assemblies.assembly_participatory_space_private_users_path(participatory_space), :inclusive)
+                url: decidim_assemblies.assembly_members_path(participatory_space),
+                active: is_active_link?(decidim_assemblies.assembly_members_path(participatory_space), :inclusive)
               }]
             end
            )
         ] + components.map do |component|
           {
-            name: translated_attribute(component.name),
+            name: decidim_escape_translated(component.name),
             url: main_component_path(component),
             active: is_active_link?(main_component_path(component), :inclusive)
           }

data/app/helpers/decidim/assemblies/filter_assemblies_helper.rb

@@ -10,7 +10,8 @@ module Decidim
         items = []
 
         available_taxonomy_filters.find_each do |taxonomy_filter|
-          items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+          items.append(method: :with_any_taxonomies,
+                       name: "[with_any_taxonomies][#{taxonomy_filter.root_taxonomy_id}]",
                        collection: filter_taxonomy_values_for(taxonomy_filter),
                        label: decidim_sanitize_translated(taxonomy_filter.name),
                        id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")

data/app/models/decidim/assembly.rb

@@ -31,7 +31,7 @@ module Decidim
     include Decidim::Traceable
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
-    include Decidim::HasPrivateUsers
+    include Decidim::ParticipatorySpace::HasMembers
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
@@ -53,10 +53,6 @@ module Decidim
                foreign_key: "decidim_area_id",
                class_name: "Decidim::Area",
                optional: true
-    belongs_to :assembly_type,
-               foreign_key: "decidim_assemblies_type_id",
-               class_name: "Decidim::AssembliesType",
-               optional: true
     has_many :categories,
              foreign_key: "decidim_participatory_space_id",
              foreign_type: "decidim_participatory_space_type",
@@ -71,9 +67,6 @@ module Decidim
     has_one_attached :hero_image
     validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
-    has_one_attached :banner_image
-    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
-
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
 
@@ -92,10 +85,14 @@ module Decidim
                       index_on_create: ->(_assembly) { false },
                       index_on_update: ->(assembly) { assembly.visible? })
 
-    # Overwriting existing method Decidim::HasPrivateUsers.public_spaces
-    def self.public_spaces
-      where(private_space: false).or(where(private_space: true).where(is_transparent: true)).published
-    end
+    # Access modes are consistent across participatory spaces (assemblies and processes)
+    # open: visible and accessible for all
+    # transparent: visible for all but the actions require to be a member of the space
+    # restricted: visible and accessible only for members fo the space
+    ACCESS_MODES = { open: 0, transparent: 1, restricted: 2 }.freeze
+    enum :access_mode, ACCESS_MODES
+
+    scope_search_multi :with_any_access_mode, ACCESS_MODES.keys
 
     # Scope to return only the promoted assemblies.
     #
@@ -120,7 +117,7 @@ module Decidim
 
     # This is a overwrite for Decidim::ParticipatorySpaceResourceable.visible?
     def visible?
-      published? && (!private_space? || (private_space? && is_transparent?))
+      published? && (open? || transparent?)
     end
 
     def to_param
@@ -157,7 +154,7 @@ module Decidim
     end
 
     def self.ransackable_scopes(_auth_object = nil)
-      [:with_any_taxonomies]
+      [:with_any_taxonomies, :with_any_access_mode]
     end
 
     def shareable_url(share_token)
@@ -169,7 +166,7 @@ module Decidim
 
       return base unless auth_object&.admin?
 
-      base + %w(published_at created_at private_space parent_id)
+      base + %w(published_at created_at parent_id access_mode)
     end
 
     def self.ransackable_associations(_auth_object = nil)