decidim-assemblies 0.17.2 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0f24943af63649276875cef491e3886e5e018e16a770e50ef601a8bb6a37c9
-  data.tar.gz: c236863c629a10f674a7a89f1933c709184305e5f3d41d3281f902182f50194d
+  metadata.gz: 99efc61ca1742e63f78a52fa33da8866b60669bbeca04b039814da09cfa148c4
+  data.tar.gz: 7ab6f6d231c564795a4319ddb527824f728108b7ee43f057ed86f68e277d682b
 SHA512:
-  metadata.gz: 4916c1abd79855781ea8fa6ea5827e9116b3627057845439c77fed5de121692332b5952b45db5ba96af194c1b29a882dc8494ef629ede6da84c8c361fa10ef88
-  data.tar.gz: 5e8312841a18b16513c2939e7f985624851dacd71cfb38ee79a4e24decf906626d9fa0366289f05a3b015a373dd512bf6907c0f3f53f34b37f1874ddb0aebdf5
+  metadata.gz: 8bfc9691a80e376d750ca2aef2895d8b1eb4aa60fbd5059498676e6c5fcb7815b46dd62ab3e2059e20c38d5ed9fa6b5acd409a07478cd982f43838d7d9c4f26f
+  data.tar.gz: bc458c5c4ef271e1ffa85d988849111d0002d6e362b2c55b0df0da105d88b4bd9ae18d92b480c91c485553fc6c6ba99100f7c5564bd8f4ba31b71569c5e2e385

data/app/cells/decidim/assemblies/assembly_m/footer.erb

@@ -7,7 +7,7 @@
       </div>
     <% end %>
     <%= link_to(
-      t("layouts.decidim.assemblies.assembly.take_part"),
+      t(model.cta_button_text_key, scope: "layouts.decidim.assemblies.assembly"),
       resource_path,
       class: "card__button button button--sc secondary light small"
     ) %>

data/app/cells/decidim/assemblies/assembly_m_cell.rb

@@ -18,6 +18,10 @@ module Decidim
         true
       end
 
+      def has_children?
+        model.children.any?
+      end
+
       def resource_path
         Decidim::Assemblies::Engine.routes.url_helpers.assembly_path(model)
       end
@@ -27,7 +31,26 @@ module Decidim
       end
 
       def statuses
-        [:creation_date, :follow]
+        return super unless has_children?
+        [:creation_date, :follow, :children_count]
+      end
+
+      def children_count_status
+        content_tag(
+          :strong,
+          t("layouts.decidim.assemblies.index.children")
+        ) + " " + children_assemblies_visible_for_user
+      end
+
+      def children_assemblies_visible_for_user
+        assemblies = model.children.published
+
+        if current_user
+          return assemblies.count.to_s if current_user.admin
+          assemblies.visible_for(current_user).count.to_s
+        else
+          assemblies.public_spaces.count.to_s
+        end
       end
 
       def resource_icon

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

@@ -53,6 +53,7 @@ module Decidim
             parent: @assembly.parent,
             developer_group: @assembly.developer_group,
             local_area: @assembly.local_area,
+            area: @assembly.area,
             target: @assembly.target,
             participatory_scope: @assembly.participatory_scope,
             participatory_structure: @assembly.participatory_structure,

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

@@ -5,6 +5,10 @@ module Decidim
     module Admin
       # The main admin application controller for assemblies
       class ApplicationController < Decidim::Admin::ApplicationController
+        register_permissions(::Decidim::Assemblies::Admin::ApplicationController,
+                             Decidim::Assemblies::Permissions,
+                             Decidim::Admin::Permissions)
+
         private
 
         def permissions_context
@@ -14,10 +18,7 @@ module Decidim
         end
 
         def permission_class_chain
-          [
-            Decidim::Assemblies::Permissions,
-            Decidim::Admin::Permissions
-          ]
+          ::Decidim.permissions_registry.chain_for(::Decidim::Assemblies::Admin::ApplicationController)
         end
       end
     end

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

@@ -6,7 +6,8 @@ module Decidim
       # Controller that allows managing assemblies.
       #
       class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
-        helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space
+        include Decidim::Paginable
+        helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space, :query
         layout "decidim/admin/assemblies"
 
         before_action :set_all_assemblies, except: [:index]
@@ -71,12 +72,26 @@ module Decidim
 
         private
 
+        def organization_assemblies
+          @organization_assemblies ||= OrganizationAssemblies.new(current_user.organization).query
+        end
+
+        def query
+          organization_assemblies
+            .where(parent_id: params[:parent_id])
+            .ransack(params[:q])
+        end
+
+        def collection
+          @collection ||= paginate(query.result)
+        end
+
         def set_all_assemblies
-          @all_assemblies = OrganizationAssemblies.new(current_user.organization).query
+          @all_assemblies = organization_assemblies
         end
 
         def current_assembly
-          scope = OrganizationAssemblies.new(current_user.organization).query
+          scope = organization_assemblies
           @current_assembly ||= scope.where(slug: params[:slug]).or(
             scope.where(id: params[:slug])
           ).first
@@ -85,16 +100,11 @@ module Decidim
         alias current_participatory_space current_assembly
 
         def parent_assembly
-          @parent_assembly ||= OrganizationAssemblies.new(current_organization).query.find_by(id: params[:parent_id])
+          @parent_assembly ||= organization_assemblies.find_by(id: params[:parent_id])
         end
 
         def parent_assemblies
-          @parent_assemblies ||= OrganizationAssemblies.new(current_user.organization).query.where(parent_id: nil)
-        end
-
-        def collection
-          parent_id = params[:parent_id].presence
-          @collection ||= OrganizationAssemblies.new(current_user.organization).query.where(parent_id: parent_id)
+          @parent_assemblies ||= organization_assemblies.where(parent_id: nil)
         end
 
         def assembly_params

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

@@ -12,6 +12,11 @@ module Decidim
         module AssemblyAdmin
           extend ActiveSupport::Concern
 
+          RegistersPermissions
+            .register_permissions(::Decidim::Assemblies::Admin::Concerns::AssemblyAdmin,
+                                  Decidim::Assemblies::Permissions,
+                                  Decidim::Admin::Permissions)
+
           included do
             include Decidim::Admin::ParticipatorySpaceAdminContext
             participatory_space_admin_layout
@@ -35,10 +40,7 @@ module Decidim
             end
 
             def permission_class_chain
-              [
-                Decidim::Assemblies::Permissions,
-                Decidim::Admin::Permissions
-              ]
+              PermissionsRegistry.chain_for(AssemblyAdmin)
             end
           end
         end

data/app/controllers/decidim/assemblies/application_controller.rb

@@ -8,6 +8,11 @@ module Decidim
       helper Decidim::Assemblies::AssembliesHelper
       include NeedsPermission
 
+      register_permissions(Decidim::Assemblies::ApplicationController,
+                           ::Decidim::Assemblies::Permissions,
+                           ::Decidim::Admin::Permissions,
+                           ::Decidim::Permissions)
+
       private
 
       def permissions_context
@@ -17,11 +22,7 @@ module Decidim
       end
 
       def permission_class_chain
-        [
-          Decidim::Assemblies::Permissions,
-          Decidim::Admin::Permissions,
-          Decidim::Permissions
-        ]
+        ::Decidim.permissions_registry.chain_for(::Decidim::Assemblies::ApplicationController)
       end
 
       def permission_scope

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

@@ -2,19 +2,13 @@
 
 module Decidim
   module Assemblies
-    # A controller that holds the logic to show Assemblies in a
-    # public layout.
+    # A controller that holds the logic to show Assemblies in a public layout.
     class AssembliesController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
       participatory_space_layout only: :show
+      include FilterResource
 
-      helper Decidim::AttachmentsHelper
-      helper Decidim::IconHelper
-      helper Decidim::WidgetUrlsHelper
-      helper Decidim::SanitizeHelper
-      helper Decidim::ResourceReferenceHelper
-
-      helper_method :collection, :parent_assemblies, :promoted_assemblies, :assemblies, :stats, :assembly_participatory_processes
+      helper_method :parent_assemblies, :promoted_assemblies, :stats, :assembly_participatory_processes
 
       def index
         enforce_permission_to :list, :assembly
@@ -54,6 +48,18 @@ module Decidim
 
       private
 
+      def search_klass
+        AssemblySearch
+      end
+
+      def default_filter_params
+        {
+          scope_id: nil,
+          area_id: nil,
+          assembly_type: "all"
+        }
+      end
+
       def current_participatory_space
         return unless params[:slug]
 
@@ -66,18 +72,12 @@ module Decidim
         @published_assemblies ||= OrganizationPublishedAssemblies.new(current_organization, current_user)
       end
 
-      def assemblies
-        @assemblies ||= OrganizationPrioritizedAssemblies.new(current_organization, current_user)
+      def promoted_assemblies
+        @promoted_assemblies ||= published_assemblies | PromotedAssemblies.new
       end
 
       def parent_assemblies
-        @parent_assemblies ||= assemblies | ParentAssemblies.new | FilteredAssemblies.new(current_filter)
-      end
-
-      alias collection parent_assemblies
-
-      def promoted_assemblies
-        @promoted_assemblies ||= assemblies | PromotedAssemblies.new
+        search.results.parent_assemblies.order(promoted: :desc)
       end
 
       def stats
@@ -87,10 +87,6 @@ module Decidim
       def assembly_participatory_processes
         @assembly_participatory_processes ||= @current_participatory_space.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
       end
-
-      def current_filter
-        params[:filter] || "all"
-      end
     end
   end
 end

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

@@ -23,7 +23,7 @@ module Decidim
 
         validates :designation_date, presence: true
         validates :full_name, presence: true, unless: proc { |object| object.existing_user }
-        validates :position, inclusion: { in: Decidim::AssemblyMember::POSITIONS }
+        validates :position, presence: true, inclusion: { in: Decidim::AssemblyMember::POSITIONS }
         validates :position_other, presence: true, if: ->(form) { form.position == "other" }
         validates :ceased_date, date: { after: :designation_date, allow_blank: true }
         validates :user, presence: true, if: proc { |object| object.existing_user }

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

@@ -5,6 +5,12 @@ module Decidim
     # Helpers related to the Assemblies layout.
     module AssembliesHelper
       include Decidim::ResourceHelper
+      include Decidim::AttachmentsHelper
+      include Decidim::IconHelper
+      include Decidim::WidgetUrlsHelper
+      include Decidim::SanitizeHelper
+      include Decidim::ResourceReferenceHelper
+      include Decidim::FiltersHelper
       include FilterAssembliesHelper
 
       # Public: Returns the characteristics of an assembly in a readable format like

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

@@ -3,25 +3,36 @@
 module Decidim
   module Assemblies
     # Helpers related to the Assemblies filter by type.
+    #
+    # `filter` returns a Filter object from Decidim::FilterResource
     module FilterAssembliesHelper
       def available_filters
-        %w(all government executive consultative_advisory participatory working_group commission others)
+        %w(all) + Assembly::ASSEMBLY_TYPES
       end
 
-      def filter_link(filter)
-        link_to t(filter, scope: "decidim.assemblies.filter"), url_for(params.to_unsafe_h.merge(page: nil, filter: filter)), data: { filter: filter }, remote: true
+      def filter_link(filter_name)
+        Decidim::Assemblies::Engine
+          .routes
+          .url_helpers
+          .assemblies_path(
+            filter: {
+              scope_id: filter.scope_id,
+              area_id: filter.area_id,
+              assembly_type: filter_name
+            }
+          )
       end
 
       def help_text
         t("help", scope: "decidim.assemblies.filter")
       end
 
-      def filter
-        params[:filter] || "all"
+      def filter_name(filter_key)
+        t(filter_key, scope: "decidim.assemblies.filter")
       end
 
-      def current_filter_text
-        t(filter, scope: "decidim.assemblies.filter")
+      def current_filter_name
+        filter_name(filter.assembly_type)
       end
     end
   end

data/app/models/decidim/assembly.rb

@@ -68,12 +68,25 @@ module Decidim
     after_create :set_parents_path
     after_update :set_parents_path, :update_children_paths, if: :saved_change_to_parent_id?
 
-    scope :visible_for, lambda { |user|
-                          joins("LEFT JOIN decidim_participatory_space_private_users ON
-                          decidim_participatory_space_private_users.privatable_to_id = #{table_name}.id")
-                            .where("(private_space = ? and decidim_participatory_space_private_users.decidim_user_id = ?)
-                            or private_space = ? or (private_space = ? and is_transparent = ?)", true, user, false, true, true).distinct
-                        }
+    # Overwriting existing method Decidim::HasPrivateUsers.visible_for
+    def self.visible_for(user)
+      if user
+        return all if user.admin?
+
+        left_outer_joins(:participatory_space_private_users).where(
+          %{private_space = false OR
+          (private_space = true AND is_transparent = true) OR
+          decidim_participatory_space_private_users.decidim_user_id = ?}, user.id
+        ).distinct
+      else
+        public_spaces
+      end
+    end
+
+    # Overwriting existing method Decidim::HasPrivateUsers.public_spaces
+    def self.public_spaces
+      where(private_space: false).or(where(private_space: true).where(is_transparent: true))
+    end
 
     # Scope to return only the promoted assemblies.
     #
@@ -82,12 +95,14 @@ module Decidim
       where(promoted: true)
     end
 
-    def self.private_assemblies
-      where(private_space: true)
+    # Return parent assemblies.
+    def self.parent_assemblies
+      where(parent_id: nil)
     end
 
-    def self.public_spaces
-      super.where(private_space: false).or(Decidim::Assembly.where(private_space: true).where(is_transparent: true))
+    # Return child assemblies.
+    def self.child_assemblies
+      where.not(parent_id: nil)
     end
 
     def self.log_presenter_class_for(_log)
@@ -121,6 +136,12 @@ module Decidim
       Decidim::AssemblyPresenter.new(self).translated_title
     end
 
+    def closed?
+      return false if closing_date.blank?
+
+      closing_date < Date.current
+    end
+
     private
 
     # When an assembly changes their parent, we need to update the parents_path attribute
@@ -171,5 +192,10 @@ module Decidim
       )
     end
     # rubocop:enable Rails/SkipsModelValidations
+
+    # Allow ransacker to search for a key in a hstore column (`title`.`en`)
+    ransacker :title do |parent|
+      Arel::Nodes::InfixOperation.new("->", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+    end
   end
 end

data/app/permissions/decidim/assemblies/permissions.rb

@@ -171,7 +171,7 @@ module Decidim
         allow! if permission_action.action == :read || permission_action.action == :preview
       end
 
-      # Process admins can eprform everything *inside* that assembly. They cannot
+      # Process admins can perform everything *inside* that assembly. They cannot
       # create a assembly or perform actions on assembly groups or other
       # assemblies.
       def assembly_admin_action?

data/app/queries/decidim/assemblies/admin/admin_users.rb

@@ -23,7 +23,7 @@ module Decidim
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins)
+          Decidim::User.where(id: organization_admins).or(assembly_user_admins)
         end
 
         private
@@ -33,6 +33,13 @@ module Decidim
         def organization_admins
           assembly.organization.admins
         end
+
+        def assembly_user_admins
+          assembly_user_admin_ids = Decidim::AssemblyUserRole
+                                    .where(assembly: assembly, role: :admin)
+                                    .pluck(:decidim_user_id)
+          Decidim::User.where(id: assembly_user_admin_ids)
+        end
       end
     end
   end