decidim-assemblies 0.11.2 → 0.12.0.pre

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

@@ -5,23 +5,23 @@ module Decidim
     module Admin
       # Controller that allows managing assemblies.
       #
-      class AssembliesController < Decidim::Admin::ApplicationController
+      class AssembliesController < Decidim::Assemblies::Admin::ApplicationController
         helper_method :current_assembly, :parent_assembly, :parent_assemblies, :current_participatory_space
         layout "decidim/admin/assemblies"
 
         def index
-          authorize! :index, Decidim::Assembly
+          enforce_permission_to :read, :assembly_list
           @assemblies = collection
         end
 
         def new
-          authorize! :new, Decidim::Assembly
+          enforce_permission_to :create, :assembly
           @form = form(AssemblyForm).instance
           @form.parent_id = params[:parent_id]
         end
 
         def create
-          authorize! :new, Decidim::Assembly
+          enforce_permission_to :create, :assembly
           @form = form(AssemblyForm).from_params(params)
 
           CreateAssembly.call(@form) do
@@ -38,13 +38,13 @@ module Decidim
         end
 
         def edit
-          authorize! :update, current_assembly
+          enforce_permission_to :update, :assembly, assembly: current_assembly
           @form = form(AssemblyForm).from_model(current_assembly)
           render layout: "decidim/admin/assembly"
         end
 
         def update
-          authorize! :update, current_assembly
+          enforce_permission_to :update, :assembly, assembly: current_assembly
           @form = form(AssemblyForm).from_params(
             assembly_params,
             assembly_id: current_assembly.id
@@ -64,7 +64,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :destroy, current_assembly
+          enforce_permission_to :destroy, :assembly, assembly: current_assembly
           current_assembly.destroy!
 
           flash[:notice] = I18n.t("assemblies.destroy.success", scope: "decidim.admin")
@@ -73,7 +73,7 @@ module Decidim
         end
 
         def copy
-          authorize! :create, Decidim::Assembly
+          enforce_permission_to :create, :assembly
         end
 
         private
@@ -100,10 +100,6 @@ module Decidim
           @collection ||= OrganizationAssemblies.new(current_user.organization).query.where(parent_id: parent_id)
         end
 
-        def ability_context
-          super.merge(current_participatory_space: current_assembly)
-        end
-
         def assembly_params
           {
             id: params[:slug],

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # Controller that allows managing all the attachment collections for an assembly.
       #
-      class AssemblyAttachmentCollectionsController < Decidim::Admin::ApplicationController
+      class AssemblyAttachmentCollectionsController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasAttachmentCollections
 

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

@@ -6,7 +6,7 @@ module Decidim
       # Controller that allows managing all the attachments for a participatory
       # assembly.
       #
-      class AssemblyAttachmentsController < Decidim::Admin::ApplicationController
+      class AssemblyAttachmentsController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasAttachments
 

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

@@ -5,16 +5,16 @@ module Decidim
     module Admin
       # Controller that allows managing assemblies.
       #
-      class AssemblyCopiesController < Decidim::Admin::ApplicationController
+      class AssemblyCopiesController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
 
         def new
-          authorize! :new, Decidim::Assembly
+          enforce_permission_to :create, :assembly
           @form = form(AssemblyCopyForm).from_model(current_assembly)
         end
 
         def create
-          authorize! :create, Decidim::Assembly
+          enforce_permission_to :create, :assembly
           @form = form(AssemblyCopyForm).from_params(params)
 
           CopyAssembly.call(@form, current_assembly) do

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # Controller that allows managing assembly members.
+      #
+      class AssemblyMembersController < Decidim::Assemblies::Admin::ApplicationController
+        include Concerns::AssemblyAdmin
+
+        def index
+          enforce_permission_to :index, :assembly_member
+
+          @query = params[:q]
+          @status = params[:status]
+
+          @assembly_members = Decidim::Assemblies::Admin::AssemblyMembers.for(collection, @query, @status).page(params[:page]).per(15)
+        end
+
+        def new
+          enforce_permission_to :create, :assembly_member
+          @form = form(AssemblyMemberForm).instance
+        end
+
+        def create
+          enforce_permission_to :create, :assembly_member
+          @form = form(AssemblyMemberForm).from_params(params)
+
+          CreateAssemblyMember.call(@form, current_user, current_assembly) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assembly_members.create.success", scope: "decidim.admin")
+              redirect_to assembly_members_path(current_assembly)
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("assembly_members.create.error", scope: "decidim.admin")
+              render :new
+            end
+          end
+        end
+
+        def edit
+          @assembly_member = collection.find(params[:id])
+          enforce_permission_to :update, :assembly_member, member: @assembly_member
+          @form = form(AssemblyMemberForm).from_model(@assembly_member)
+        end
+
+        def update
+          @assembly_member = collection.find(params[:id])
+          enforce_permission_to :update, :assembly_member, member: @assembly_member
+          @form = form(AssemblyMemberForm).from_params(params)
+
+          UpdateAssemblyMember.call(@form, @assembly_member) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assembly_members.update.success", scope: "decidim.admin")
+              redirect_to assembly_members_path(current_assembly)
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("assembly_members.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        def destroy
+          @assembly_member = collection.find(params[:id])
+          enforce_permission_to :destroy, :assembly_member, member: @assembly_member
+
+          DestroyAssemblyMember.call(@assembly_member, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("assembly_members.destroy.success", scope: "decidim.admin")
+              redirect_to assembly_members_path(current_assembly)
+            end
+          end
+        end
+
+        private
+
+        def collection
+          @collection ||= Decidim::AssemblyMember.where(assembly: current_assembly)
+        end
+      end
+    end
+  end
+end

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

@@ -5,11 +5,11 @@ module Decidim
     module Admin
       # Controller that allows managing assembly publications.
       #
-      class AssemblyPublicationsController < Decidim::Admin::ApplicationController
+      class AssemblyPublicationsController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
 
         def create
-          authorize! :publish, current_assembly
+          enforce_permission_to :publish, :assembly, assembly: current_assembly
 
           PublishAssembly.call(current_assembly, current_user) do
             on(:ok) do
@@ -25,7 +25,7 @@ module Decidim
         end
 
         def destroy
-          authorize! :publish, current_assembly
+          enforce_permission_to :publish, :assembly, assembly: current_assembly
 
           UnpublishAssembly.call(current_assembly, current_user) do
             on(:ok) do

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

@@ -9,17 +9,17 @@ module Decidim
         include Concerns::AssemblyAdmin
 
         def index
-          authorize! :read, Decidim::AssemblyUserRole
+          enforce_permission_to :index, :assembly_user_role
           @assembly_user_roles = collection
         end
 
         def new
-          authorize! :create, Decidim::AssemblyUserRole
+          enforce_permission_to :create, :assembly_user_role
           @form = form(AssemblyUserRoleForm).instance
         end
 
         def create
-          authorize! :create, Decidim::AssemblyUserRole
+          enforce_permission_to :create, :assembly_user_role
           @form = form(AssemblyUserRoleForm).from_params(params)
 
           CreateAssemblyAdmin.call(@form, current_user, current_assembly) do
@@ -36,13 +36,13 @@ module Decidim
 
         def edit
           @user_role = collection.find(params[:id])
-          authorize! :update, @user_role
+          enforce_permission_to :update, :assembly_user_role, user_role: @user_role
           @form = form(AssemblyUserRoleForm).from_model(@user_role.user)
         end
 
         def update
           @user_role = collection.find(params[:id])
-          authorize! :update, @user_role
+          enforce_permission_to :update, :assembly_user_role, user_role: @user_role
           @form = form(AssemblyUserRoleForm).from_params(params)
 
           UpdateAssemblyAdmin.call(@form, @user_role) do
@@ -60,7 +60,7 @@ module Decidim
 
         def destroy
           @assembly_user_role = collection.find(params[:id])
-          authorize! :destroy, @assembly_user_role
+          enforce_permission_to :destroy, :assembly_user_role, user_role: @assembly_user_role
 
           DestroyAssemblyAdmin.call(@assembly_user_role, current_user) do
             on(:ok) do
@@ -72,7 +72,7 @@ module Decidim
 
         def resend_invitation
           @user_role = collection.find(params[:id])
-          authorize! :invite, @user_role
+          enforce_permission_to :invite, :assembly_user_role, user_role: @user_role
 
           InviteUserAgain.call(@user_role.user, "invite_admin") do
             on(:ok) do

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

@@ -17,17 +17,29 @@ module Decidim
             participatory_space_admin_layout
 
             helper_method :current_assembly
+
+            def current_assembly
+              @current_assembly ||= organization_assemblies.find_by!(
+                slug: params[:assembly_slug] || params[:slug]
+              )
+            end
+
             alias_method :current_participatory_space, :current_assembly
-          end
 
-          def current_assembly
-            @current_assembly ||= organization_assemblies.find_by!(
-              slug: params[:assembly_slug] || params[:slug]
-            )
-          end
+            def organization_assemblies
+              @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
+            end
+
+            def permissions_context
+              super.merge(current_participatory_space: current_participatory_space)
+            end
 
-          def organization_assemblies
-            @organization_assemblies ||= OrganizationAssemblies.new(current_organization).query
+            def permission_class_chain
+              [
+                Decidim::Assemblies::Permissions,
+                Decidim::Admin::Permissions
+              ]
+            end
           end
         end
       end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # Controller that allows managing assembly private users
       # on assembies
-      class ParticipatorySpacePrivateUsersController < Decidim::Admin::ApplicationController
+      class ParticipatorySpacePrivateUsersController < Decidim::Assemblies::Admin::ApplicationController
         include Concerns::AssemblyAdmin
         include Decidim::Admin::Concerns::HasPrivateUsers
 

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # The main admin application controller for assemblies
+    class ApplicationController < Decidim::ApplicationController
+      helper Decidim::ApplicationHelper
+      helper Decidim::Assemblies::AssembliesHelper
+      include NeedsPermission
+
+      private
+
+      def permissions_context
+        super.merge(
+          current_participatory_space: try(:current_participatory_space)
+        )
+      end
+
+      def permission_class_chain
+        [
+          Decidim::Assemblies::Permissions,
+          Decidim::Admin::Permissions,
+          Decidim::Permissions
+        ]
+      end
+
+      def permission_scope
+        :public
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Decidim
   module Assemblies
     # A controller that holds the logic to show Assemblies in a
     # public layout.
-    class AssembliesController < Decidim::ApplicationController
+    class AssembliesController < Decidim::Assemblies::ApplicationController
       include ParticipatorySpaceContext
       participatory_space_layout only: :show
 
@@ -19,7 +19,7 @@ module Decidim
       def index
         redirect_to "/404" if published_assemblies.none?
 
-        authorize! :read, Assembly
+        enforce_permission_to :list, :assembly
       end
 
       def show

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

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    class AssemblyMembersController < Decidim::Assemblies::ApplicationController
+      include ParticipatorySpaceContext
+      participatory_space_layout only: :index
+
+      helper_method :collection
+
+      def index
+        raise ActionController::RoutingError, "No members for this assembly" if members.none?
+
+        enforce_permission_to :list, :members
+        redirect_to decidim_assemblies.assembly_path(current_participatory_space) unless current_user_can_visit_space?
+      end
+
+      private
+
+      def members
+        @members ||= current_participatory_space.members.not_ceased
+      end
+
+      alias collection members
+
+      def current_participatory_space
+        return unless params[:assembly_slug]
+
+        @current_participatory_space ||= OrganizationAssemblies.new(current_organization).query.where(slug: params[:assembly_slug]).or(
+          OrganizationAssemblies.new(current_organization).query.where(id: params[:assembly_slug])
+        ).first!
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # A form object used to create assembly members from the admin dashboard.
+      #
+      class AssemblyMemberForm < Form
+        mimic :assembly_member
+
+        attribute :weight, Integer, default: 0
+        attribute :full_name, String
+        attribute :gender, String
+        attribute :birthday, Decidim::Attributes::TimeWithZone
+        attribute :birthplace, String
+        attribute :ceased_date, Decidim::Attributes::TimeWithZone
+        attribute :designation_date, Decidim::Attributes::TimeWithZone
+        attribute :designation_mode, String
+        attribute :position, String
+        attribute :position_other, String
+        attribute :user_id, Integer
+        attribute :existing_user, Boolean, default: false
+
+        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_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 }
+
+        def map_model(model)
+          self.user_id = model.decidim_user_id
+          self.existing_user = user_id.present?
+        end
+
+        def user
+          @user ||= current_organization.users.find_by(id: user_id)
+        end
+
+        def positions_for_select
+          Decidim::AssemblyMember::POSITIONS.map do |position|
+            [
+              I18n.t(position, scope: "decidim.admin.models.assembly_member.positions"),
+              position
+            ]
+          end
+        end
+      end
+    end
+  end
+end