decidim-initiatives 0.23.5 → 0.24.2

data/app/controllers/decidim/initiatives/admin/committee_requests_controller.rb

@@ -15,16 +15,27 @@ module Decidim
         # GET /initiatives/:initiative_id/committee_requests/:id/approve
         def approve
           enforce_permission_to :approve, :initiative_committee_member, request: membership_request
-          membership_request.accepted!
 
-          redirect_to initiative_committee_requests_path(membership_request.initiative)
+          ApproveMembershipRequest.call(membership_request) do
+            on(:ok) do
+              redirect_to edit_initiative_path(current_initiative), flash: {
+                notice: I18n.t("success", scope: "decidim.initiatives.committee_requests.approve")
+              }
+            end
+          end
         end
 
         # DELETE /initiatives/:initiative_id/committee_requests/:id/revoke
         def revoke
           enforce_permission_to :revoke, :initiative_committee_member, request: membership_request
-          membership_request.rejected!
-          redirect_to initiative_committee_requests_path(membership_request.initiative)
+
+          RevokeMembershipRequest.call(membership_request) do
+            on(:ok) do
+              redirect_to edit_initiative_path(current_initiative), flash: {
+                notice: I18n.t("success", scope: "decidim.initiatives.committee_requests.revoke")
+              }
+            end
+          end
         end
 
         private

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -49,7 +49,7 @@ module Decidim
           @form = form(Decidim::Initiatives::Admin::InitiativeForm)
                   .from_params(params, initiative: current_initiative)
 
-          UpdateInitiative.call(current_initiative, @form, current_user) do
+          Decidim::Initiatives::Admin::UpdateInitiative.call(current_initiative, @form, current_user) do
             on(:ok) do |initiative|
               flash[:notice] = I18n.t("initiatives.update.success", scope: "decidim.initiatives.admin")
               redirect_to edit_initiative_path(initiative)

data/app/controllers/decidim/initiatives/admin/moderations/reports_controller.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      module Moderations
+        # This controller allows admins to manage moderation reports in an conference.
+        class ReportsController < Decidim::Admin::Moderations::ReportsController
+          include InitiativeAdmin
+
+          def permissions_context
+            super.merge(current_participatory_space: current_participatory_space)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/initiatives/committee_requests_controller.rb

@@ -40,6 +40,38 @@ module Decidim
           end
         end
       end
+
+      # GET /initiatives/:initiative_id/committee_requests/:id/approve
+      def approve
+        enforce_permission_to :approve, :initiative_committee_member, request: membership_request
+
+        ApproveMembershipRequest.call(membership_request) do
+          on(:ok) do
+            redirect_to edit_initiative_path(current_initiative), flash: {
+              notice: I18n.t("success", scope: "decidim.initiatives.committee_requests.approve")
+            }
+          end
+        end
+      end
+
+      # DELETE /initiatives/:initiative_id/committee_requests/:id/revoke
+      def revoke
+        enforce_permission_to :revoke, :initiative_committee_member, request: membership_request
+
+        RevokeMembershipRequest.call(membership_request) do
+          on(:ok) do
+            redirect_to edit_initiative_path(current_initiative), flash: {
+              notice: I18n.t("success", scope: "decidim.initiatives.committee_requests.revoke")
+            }
+          end
+        end
+      end
+
+      private
+
+      def membership_request
+        @membership_request ||= InitiativesCommitteeMember.find(params[:id])
+      end
     end
   end
 end

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -21,17 +21,18 @@ module Decidim
       include InitiativeSlug
       include FilterResource
       include Paginable
+      include Decidim::FormFactory
       include Decidim::Initiatives::Orderable
       include TypeSelectorOptions
       include NeedsInitiative
       include SingleInitiativeType
 
       helper_method :collection, :initiatives, :filter, :stats
+      helper_method :initiative_type
 
       # GET /initiatives
       def index
         enforce_permission_to :list, :initiative
-
         return unless search.results.blank? && params.dig("filter", "state") != %w(closed)
 
         @closed_initiatives = search_klass.new(search_params.merge(state: %w(closed)))
@@ -40,6 +41,7 @@ module Decidim
           params[:filter] ||= {}
           params[:filter][:date] = %w(closed)
           @forced_closed_initiatives = true
+
           @search = @closed_initiatives
         end
       end
@@ -49,6 +51,61 @@ module Decidim
         enforce_permission_to :read, :initiative, initiative: current_initiative
       end
 
+      # GET /initiatives/:id/send_to_technical_validation
+      def send_to_technical_validation
+        enforce_permission_to :send_to_technical_validation, :initiative, initiative: current_initiative
+
+        SendInitiativeToTechnicalValidation.call(current_initiative, current_user) do
+          on(:ok) do
+            redirect_to EngineRouter.main_proxy(current_initiative).initiatives_path(initiative_slug: nil), flash: {
+              notice: I18n.t(
+                "success",
+                scope: %w(decidim initiatives admin initiatives edit)
+              )
+            }
+          end
+        end
+      end
+
+      # GET /initiatives/:slug/edit
+      def edit
+        enforce_permission_to :edit, :initiative, initiative: current_initiative
+        form_attachment_model = form(AttachmentForm).from_model(current_initiative.attachments.first)
+        @form = form(Decidim::Initiatives::InitiativeForm)
+                .from_model(
+                  current_initiative,
+                  initiative: current_initiative
+                )
+        @form.attachment = form_attachment_model
+
+        render layout: "decidim/initiative"
+      end
+
+      # PUT /initiatives/:id
+      def update
+        enforce_permission_to :update, :initiative, initiative: current_initiative
+
+        params[:id] = params[:slug]
+        @form = form(Decidim::Initiatives::InitiativeForm)
+                .from_params(params, initiative_type: current_initiative.type, initiative: current_initiative)
+
+        UpdateInitiative.call(current_initiative, @form, current_user) do
+          on(:ok) do |initiative|
+            flash[:notice] = I18n.t("success", scope: "decidim.initiatives.update")
+            redirect_to initiative_path(initiative)
+          end
+
+          on(:invalid) do
+            flash.now[:alert] = I18n.t("error", scope: "decidim.initiatives.update")
+            render :edit, layout: "decidim/initiative"
+          end
+        end
+      end
+
+      def print
+        enforce_permission_to :read, :initiative, initiative: current_initiative
+      end
+
       private
 
       alias current_initiative current_participatory_space

data/app/events/decidim/initiatives/approve_membership_request_event.rb

@@ -0,0 +1,61 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class ApproveMembershipRequestEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.initiatives.events.approve_membership_request.email_subject",
+          author_nickname: author_nickname
+        )
+      end
+
+      def email_intro
+        I18n.t(
+          "decidim.initiatives.events.approve_membership_request.email_intro",
+          resource_title: resource_title,
+          resource_url: resource_url,
+          author_profile_url: author_profile_url,
+          author_nickname: author_nickname
+        )
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.initiatives.events.approve_membership_request.email_outro",
+          resource_title: resource_title,
+          resource_url: resource_url
+        )
+      end
+
+      def notification_title
+        I18n.t(
+          "decidim.initiatives.events.approve_membership_request.notification_title",
+          resource_title: resource_title,
+          resource_url: resource_url,
+          author_profile_url: author_profile_url,
+          author_nickname: author_nickname
+        ).html_safe
+      end
+
+      private
+
+      def author_nickname
+        author.nickname
+      end
+
+      def author_profile_url
+        author.profile_url
+      end
+
+      def author
+        @author ||= Decidim::UserPresenter.new(
+          Decidim::User.find(@extra["author"]["id"])
+        )
+      end
+    end
+  end
+end

data/app/events/decidim/initiatives/initiative_sent_to_technical_validation_event.rb

@@ -0,0 +1,19 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class InitiativeSentToTechnicalValidationEvent < Decidim::Events::SimpleEvent
+      include Rails.application.routes.mounted_helpers
+
+      i18n_attributes :admin_initiative_url, :admin_initiative_path
+
+      def admin_initiative_path
+        ResourceLocatorPresenter.new(resource).edit
+      end
+
+      def admin_initiative_url
+        decidim_admin_initiatives.edit_initiative_url(resource, resource.mounted_params)
+      end
+    end
+  end
+end

data/app/events/decidim/initiatives/revoke_membership_request_event.rb

@@ -0,0 +1,61 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class RevokeMembershipRequestEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.initiatives.events.revoke_membership_request.email_subject",
+          author_nickname: author_nickname
+        )
+      end
+
+      def email_intro
+        I18n.t(
+          "decidim.initiatives.events.revoke_membership_request.email_intro",
+          resource_title: resource_title,
+          resource_url: resource_url,
+          author_profile_url: author_profile_url,
+          author_nickname: author_nickname
+        )
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.initiatives.events.revoke_membership_request.email_outro",
+          resource_title: resource_title,
+          resource_url: resource_url
+        )
+      end
+
+      def notification_title
+        I18n.t(
+          "decidim.initiatives.events.revoke_membership_request.notification_title",
+          resource_title: resource_title,
+          resource_url: resource_url,
+          author_profile_url: author_profile_url,
+          author_nickname: author_nickname
+        ).html_safe
+      end
+
+      private
+
+      def author_nickname
+        author.nickname
+      end
+
+      def author_profile_url
+        author.profile_url
+      end
+
+      def author
+        @author ||= Decidim::UserPresenter.new(
+          Decidim::User.find(@extra["author"]["id"])
+        )
+      end
+    end
+  end
+end

data/app/events/decidim/initiatives/spawn_committee_request_event.rb

@@ -0,0 +1,61 @@
+# frozen-string_literal: true
+
+module Decidim
+  module Initiatives
+    class SpawnCommitteeRequestEvent < Decidim::Events::BaseEvent
+      include Decidim::Events::EmailEvent
+      include Decidim::Events::NotificationEvent
+
+      def email_subject
+        I18n.t(
+          "decidim.initiatives.events.spawn_committee_request_event.email_subject",
+          applicant_nickname: applicant_nickname
+        )
+      end
+
+      def email_intro
+        I18n.t(
+          "decidim.initiatives.events.spawn_committee_request_event.email_intro",
+          resource_title: resource_title,
+          resource_url: resource_url,
+          applicant_profile_url: applicant_profile_url,
+          applicant_nickname: applicant_nickname
+        )
+      end
+
+      def email_outro
+        I18n.t(
+          "decidim.initiatives.events.spawn_committee_request_event.email_outro",
+          resource_title: resource_title,
+          resource_url: resource_url
+        )
+      end
+
+      def notification_title
+        I18n.t(
+          "decidim.initiatives.events.spawn_committee_request_event.notification_title",
+          resource_title: resource_title,
+          resource_url: resource_url,
+          applicant_profile_url: applicant_profile_url,
+          applicant_nickname: applicant_nickname
+        ).html_safe
+      end
+
+      private
+
+      def applicant_nickname
+        applicant.nickname
+      end
+
+      def applicant_profile_url
+        applicant.profile_url
+      end
+
+      def applicant
+        @applicant ||= Decidim::UserPresenter.new(
+          Decidim::User.find(@extra["applicant"]["id"])
+        )
+      end
+    end
+  end
+end

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -23,7 +23,7 @@ module Decidim
         attribute :state, String
         attribute :attachment, AttachmentForm
 
-        validates :title, :description, presence: true
+        validates :title, :description, translatable_presence: true
         validates :area, presence: true, if: ->(form) { form.area_id.present? }
         validates :signature_type, presence: true, if: :signature_type_updatable?
         validates :signature_start_date, presence: true, if: ->(form) { form.context.initiative.published? }
@@ -38,6 +38,8 @@ module Decidim
         validate :notify_missing_attachment_if_errored
         validate :area_is_not_removed
 
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
         def map_model(model)
           self.type_id = model.type.id
           self.decidim_scope_id = model.scope&.id
@@ -59,12 +61,14 @@ module Decidim
             end
           end
         end
+        # rubocop:enable Metrics/CyclomaticComplexity
+        # rubocop:enable Metrics/PerceivedComplexity
 
         def signature_type_updatable?
           @signature_type_updatable ||= begin
-                                          state ||= context.initiative.state
-                                          state == "validating" && context.current_user.admin? || state == "created"
-                                        end
+            state ||= context.initiative.state
+            state == "validating" && context.current_user.admin? || state == "created"
+          end
         end
 
         def state_updatable?

data/app/forms/decidim/initiatives/admin/initiative_type_form.rb

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # A form object used to collect the all the initiative type attributes.
       class InitiativeTypeForm < Decidim::Form
+        DEFAULT_MINIMUM_COMMITTEE_MEMBERS = 2
+
         include TranslatableAttributes
 
         mimic :initiatives_type
@@ -39,6 +41,7 @@ module Decidim
 
         def minimum_committee_members
           return 0 unless promoting_committee_enabled?
+          return DEFAULT_MINIMUM_COMMITTEE_MEMBERS if super.blank?
 
           super
         end