decidim-assemblies 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab1bf1a71275b8b6b547fbf43f143f4608ada5eef3c894ce1117be6e9cf3774
-  data.tar.gz: 18d03bb95e8d15dc49bf6d040fa5ebf8c596c89b8ec06d4b10faa6e601795686
+  metadata.gz: 0bce6f82592435d8eaf24b82b7e6268882e112d7ca1bf0a7199f8cd760cfa7e4
+  data.tar.gz: 01576d6f352a674f5bd0d28ab756176b07be3711167cf8050083900a5a9b2155
 SHA512:
-  metadata.gz: bd649cac9b4adfa2a917f42931d5886b3d2745b3e901da1c7cc60e39376ee5557329ec3bf5a02889a8cc03354dc5fc0ffa5bca368050e89ecf3547b1f068cf2e
-  data.tar.gz: 2d8ab9121d5f08ca6643b482aa02c5591d296cd6860ae2b879c30ef98a29f91a5dd2637764d05aac6576fd932ee88258c39aa7d24b0d22d2ba53065b3c904d45
+  metadata.gz: 14d6d72634ae5a8248be2845d9827c04853c7db7f08e311bfb58873ef868d80f2545eef306b54541080781f1082721fb6380edf7ed82f82cdb8ce1e35325f718
+  data.tar.gz: 93e76dc2e1b02588b66d6e2b67bea301c1675c6a6b036098232e0919f7590396f92ed49c85903526f967fc7aed0db0a858bd202a85f16f50a7cbb1656887d3e0

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

@@ -21,9 +21,9 @@ module Decidim
         # Returns nothing.
         def call
           return broadcast(:invalid) if form.invalid?
-          assembly = create_assembly
 
           if assembly.persisted?
+            add_admins_as_followers(assembly)
             broadcast(:ok, assembly)
           else
             form.errors.add(:hero_image, assembly.errors[:hero_image]) if assembly.errors.include? :hero_image
@@ -36,8 +36,10 @@ module Decidim
 
         attr_reader :form
 
-        def create_assembly
-          assembly = Assembly.new(
+        def assembly
+          @assembly ||= Decidim.traceability.create(
+            Assembly,
+            form.current_user,
             organization: form.current_organization,
             title: form.title,
             subtitle: form.subtitle,
@@ -50,6 +52,7 @@ module Decidim
             promoted: form.promoted,
             scopes_enabled: form.scopes_enabled,
             scope: form.scope,
+            area: form.area,
             developer_group: form.developer_group,
             local_area: form.local_area,
             target: form.target,
@@ -57,10 +60,19 @@ module Decidim
             participatory_structure: form.participatory_structure,
             meta_scope: form.meta_scope
           )
+        end
+
+        def add_admins_as_followers(assembly)
+          assembly.organization.admins.each do |admin|
+            form = Decidim::FollowForm
+                   .from_params(followable_gid: assembly.to_signed_global_id.to_s)
+                   .with_context(
+                     current_organization: assembly.organization,
+                     current_user: admin
+                   )
 
-          return assembly unless assembly.valid?
-          assembly.save!
-          assembly
+            Decidim::CreateFollow.new(form, admin).call
+          end
         end
       end
     end

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

@@ -27,8 +27,9 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           ActiveRecord::Base.transaction do
-            create_or_invite_user
+            @user = @user ||= existing_user || new_user
             create_role
+            add_admin_as_follower
           end
 
           broadcast(:ok)
@@ -42,15 +43,20 @@ module Decidim
         attr_reader :form, :assembly, :current_user, :user
 
         def create_role
-          Decidim::AssemblyUserRole.find_or_create_by!(
-            role: form.role.to_sym,
-            user: user,
-            assembly: @assembly
-          )
-        end
-
-        def create_or_invite_user
-          @user ||= existing_user || new_user
+          Decidim.traceability.perform_action!(
+            :create,
+            Decidim::AssemblyUserRole,
+            current_user,
+            resource: {
+              title: user.name
+            }
+          ) do
+            Decidim::AssemblyUserRole.find_or_create_by!(
+              role: form.role.to_sym,
+              user: user,
+              assembly: @assembly
+            )
+          end
         end
 
         def existing_user
@@ -87,6 +93,19 @@ module Decidim
           return "invite_admin" if form.role == "admin"
           "invite_collaborator"
         end
+
+        def add_admin_as_follower
+          return if user.follows?(assembly)
+
+          form = Decidim::FollowForm
+                 .from_params(followable_gid: assembly.to_signed_global_id.to_s)
+                 .with_context(
+                   current_organization: assembly.organization,
+                   current_user: user
+                 )
+
+          Decidim::CreateFollow.new(form, user).call
+        end
       end
     end
   end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A command with all the business logic when destroying an assembly
+      # admin in the system.
+      class DestroyAssemblyAdmin < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # role - the AssemblyUserRole to destroy
+        # current_user - the user performing this action
+        def initialize(role, current_user)
+          @role = role
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          destroy_role!
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :role, :current_user
+
+        def destroy_role!
+          extra_info = {
+            resource: {
+              title: role.user.name
+            }
+          }
+
+          Decidim.traceability.perform_action!(
+            "delete",
+            role,
+            current_user,
+            extra_info
+          ) do
+            role.destroy!
+            role
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,8 +8,10 @@ module Decidim
         # Public: Initializes the command.
         #
         # assembly - A Assembly that will be published
-        def initialize(assembly)
+        # current_user - the user performing the action
+        def initialize(assembly, current_user)
           @assembly = assembly
+          @current_user = current_user
         end
 
         # Executes the command. Broadcasts these events:
@@ -21,13 +23,16 @@ module Decidim
         def call
           return broadcast(:invalid) if assembly.nil? || assembly.published?
 
-          assembly.publish!
+          Decidim.traceability.perform_action!("publish", assembly, current_user) do
+            assembly.publish!
+          end
+
           broadcast(:ok)
         end
 
         private
 
-        attr_reader :assembly
+        attr_reader :assembly, :current_user
       end
     end
   end

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

@@ -7,9 +7,11 @@ module Decidim
       class UnpublishAssembly < Rectify::Command
         # Public: Initializes the command.
         #
-        # assembly - A Assembly that will be unpublished
-        def initialize(assembly)
+        # assembly - A Assembly that will be published
+        # current_user - the user performing the action
+        def initialize(assembly, current_user)
           @assembly = assembly
+          @current_user = current_user
         end
 
         # Executes the command. Broadcasts these events:
@@ -21,13 +23,16 @@ module Decidim
         def call
           return broadcast(:invalid) if assembly.nil? || !assembly.published?
 
-          assembly.unpublish!
+          Decidim.traceability.perform_action!("unpublish", assembly, current_user) do
+            assembly.unpublish!
+          end
+
           broadcast(:ok)
         end
 
         private
 
-        attr_reader :assembly
+        attr_reader :assembly, :current_user
       end
     end
   end

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

@@ -40,7 +40,16 @@ module Decidim
 
         def update_assembly
           @assembly.assign_attributes(attributes)
-          @assembly.save! if @assembly.valid?
+          save_assembly if @assembly.valid?
+        end
+
+        def save_assembly
+          transaction do
+            @assembly.save!
+            Decidim.traceability.perform_action!(:update, @assembly, form.current_user) do
+              @assembly
+            end
+          end
         end
 
         def attributes
@@ -58,6 +67,7 @@ module Decidim
             short_description: form.short_description,
             scopes_enabled: form.scopes_enabled,
             scope: form.scope,
+            area: form.area,
             developer_group: form.developer_group,
             local_area: form.local_area,
             target: form.target,

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

@@ -34,7 +34,17 @@ module Decidim
         attr_reader :form, :user_role
 
         def update_role!
-          user_role.update_attributes!(role: form.role)
+          log_info = {
+            resource: {
+              title: user_role.user.name
+            }
+          }
+          Decidim.traceability.update!(
+            user_role,
+            form.current_user,
+            { role: form.role },
+            log_info
+          )
         end
       end
     end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows managing all the attachment collections for an assembly.
+      #
+      class AssemblyAttachmentCollectionsController < Decidim::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+        include Decidim::Admin::Concerns::HasAttachmentCollections
+
+        def after_destroy_path
+          assembly_attachment_collections_path(current_assembly)
+        end
+
+        def collection_for
+          current_assembly
+        end
+
+        def authorization_object
+          @attachment_collection || AttachmentCollection
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Decidim
         def create
           authorize! :publish, current_assembly
 
-          PublishAssembly.call(current_assembly) do
+          PublishAssembly.call(current_assembly, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_publications.create.success", scope: "decidim.admin")
             end
@@ -27,7 +27,7 @@ module Decidim
         def destroy
           authorize! :publish, current_assembly
 
-          UnpublishAssembly.call(current_assembly) do
+          UnpublishAssembly.call(current_assembly, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("assembly_publications.destroy.success", scope: "decidim.admin")
             end

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

@@ -61,11 +61,13 @@ module Decidim
         def destroy
           @assembly_user_role = collection.find(params[:id])
           authorize! :destroy, @assembly_user_role
-          @assembly_user_role.destroy!
 
-          flash[:notice] = I18n.t("assembly_user_roles.destroy.success", scope: "decidim.admin")
-
-          redirect_to assembly_user_roles_path(@assembly_user_role.assembly)
+          DestroyAssemblyAdmin.call(@assembly_user_role, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assembly_user_roles.destroy.success", scope: "decidim.admin")
+              redirect_to assembly_user_roles_path(current_assembly)
+            end
+          end
         end
 
         def resend_invitation

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

@@ -12,6 +12,7 @@ module Decidim
       helper Decidim::IconHelper
       helper Decidim::WidgetUrlsHelper
       helper Decidim::SanitizeHelper
+      helper Decidim::ResourceReferenceHelper
 
       helper_method :collection, :promoted_assemblies, :assemblies, :stats
 

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

@@ -17,7 +17,7 @@ module Decidim
         attribute :copy_categories, Boolean
         attribute :copy_features, Boolean
 
-        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
+        validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, translatable_presence: true
         validate :slug_uniqueness
 

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

@@ -32,10 +32,12 @@ module Decidim
         attribute :banner_image
         attribute :remove_banner_image
         attribute :show_statistics, Boolean
+        attribute :area_id, Integer
 
-        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
+        validates :slug, presence: true, format: { with: Decidim::Assembly.slug_format }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
+        validates :area, presence: true, if: proc { |object| object.area_id.present? }
 
         validate :slug_uniqueness
 
@@ -50,6 +52,10 @@ module Decidim
           @scope ||= current_organization.scopes.where(id: scope_id).first
         end
 
+        def area
+          @area ||= current_organization.areas.where(id: area_id).first
+        end
+
         private
 
         def slug_uniqueness

data/app/models/decidim/assemblies/abilities/admin/assembly_admin_ability.rb

@@ -35,6 +35,10 @@ module Decidim
               attachment.attached_to.is_a?(Decidim::Assembly) && can_manage_assembly?(attachment.attached_to)
             end
 
+            can :manage, AttachmentCollection do |attachment_collection|
+              attachment_collection.collection_for.is_a?(Decidim::Assembly) && can_manage_assembly?(attachment_collection.collection_for)
+            end
+
             can :manage, AssemblyUserRole do |role|
               can_manage_assembly?(role.assembly) && role.user != @user
             end

data/app/models/decidim/assemblies/abilities/admin/assembly_role_ability.rb

@@ -29,7 +29,7 @@ module Decidim
           def define_assembly_abilities; end
 
           # Abstract: A subclass must define this method returning a valid role.
-          # See ParticipatoryProcessUserRoles::ROLES for more information.
+          # See AssemblyUserRole::ROLES for more information.
           def role
             raise "Needs implementation"
           end
@@ -42,7 +42,7 @@ module Decidim
           # Returns a collection of assemblies where the given user has the
           # specific role privilege.
           def assemblies_with_role_privileges
-            @assemblies ||= Decidim::Assemblies::AssembliesWithUserRole.for(@user, role)
+            @assemblies_with_role_privileges ||= Decidim::Assemblies::AssembliesWithUserRole.for(@user, role)
           end
 
           # Whether the user has at least one assembly to manage or not.

data/app/models/decidim/assemblies/abilities/assembly_role_ability.rb

@@ -30,7 +30,7 @@ module Decidim
         end
 
         # Abstract: A subclass must define this method returning a valid role.
-        # See ParticipatoryProcessUserRoles::ROLES for more information.
+        # See AssemblyUserRole::ROLES for more information.
         def role
           raise "Needs implementation"
         end
@@ -38,7 +38,7 @@ module Decidim
         # Returns a collection of Participatory assemblies where the given user has the
         # specific role privilege.
         def assemblies_with_role_privileges
-          @assemblies ||= Decidim::Assemblies::AssembliesWithUserRole.for(@user, role)
+          @assemblies_with_role_privileges ||= Decidim::Assemblies::AssembliesWithUserRole.for(@user, role)
         end
 
         # Whether the user has at least one assembly to manage or not.