decidim-initiatives 0.23.6 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c11295256da49795faf3139e2c50e896349f2cafc6dce633fcb439e34d21d90
-  data.tar.gz: d4a2fd6edbe53bb93850243ebf2fb055b6d61e799bfba7204e3a44af6bd86c52
+  metadata.gz: 309f109451d280c9b81e7cbd45d029f362719d74ee45828b6703f7e194df81a2
+  data.tar.gz: 7ea66fb898519ef7f5bcba6ff4f1655bf8dd0a08727c7002445f2a81776c3e66
 SHA512:
-  metadata.gz: 13af4b676b7a6baed12e40aee1bac41cb5b43fe85bd5de5ec1e2449a77a7597ceb9e1ac9d83dc6e2235a82cf2c142cab8d621409cbd65290d2a4bf305e7d686d
-  data.tar.gz: 5642d94ecef34874b9ac82e098010f6a7b4c82856bc7ec5ea33a3b5174eb3d56fc11f1b3c23226c8747be54e555638d166eccf3c9ffa51c94f6d15318ad2443e
+  metadata.gz: a00f4b05f5d6f52d021b5199e62f481dc0d5940f478a4d72190558be21e166e602d3c9b2d3778696d649f13a58b3480156c055176c1d3a2315a5a4a4e16e157c
+  data.tar.gz: 4c4870bf5f8de74122276425cf90b0cb15d10d8731bcff841ceabf9603c9a7c9fe07bec28ae3b22ceea97452ffb9690aed932670c8e58e86c6a5e03a7959a7cb

data/README.md

@@ -53,7 +53,7 @@ Just use the following line:
 Decidim::Initiatives.do_not_require_authorization = true
 ```
 
-All the settings and their default values which can be overriden can be found in the file [`lib/decidim/initiatives.rb`](https://github.com/decidim/decidim/blob/master/decidim-initiatives/lib/decidim/initiatives.rb).
+All the settings and their default values which can be overriden can be found in the file [`lib/decidim/initiatives.rb`](https://github.com/decidim/decidim/blob/develop/decidim-initiatives/lib/decidim/initiatives.rb).
 
 For example, you can also change the minimum number of required committee members to 1 (default is 2) by adding this line:
 ```

data/app/assets/stylesheet/decidim/initiatives/initiatives.scss

@@ -57,3 +57,9 @@
     margin-bottom: 1.5rem;
   }
 }
+
+fieldset{
+  border: 1px solid #e8e8e8;
+  padding: .5em;
+  margin-bottom: 1em;
+}

data/app/assets/stylesheet/decidim/initiatives/print-initiative.css.scss

@@ -1,4 +1,10 @@
 @media all{
+  .printable{
+    width: 80%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
   .initiative-letterhead{
     font-size: 14pt;
     font-weight: bold;
@@ -104,6 +110,14 @@
 }
 
 @media print{
+  .process-header{
+    display: none;
+  }
+
+  .main-nav{
+    display: none;
+  }
+
   .title-bar{
     display: none;
   }
@@ -119,4 +133,12 @@
   .page-break{
     page-break-before: auto;
   }
+
+  .main-footer{
+    display: none;
+  }
+
+  .mini-footer{
+    display: none;
+  }
 }

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives/show.erb

@@ -5,16 +5,12 @@
       <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3 large-up-4 card-grid">
         <% highlighted_initiatives.each do |initiative| %>
           <div class="column">
-            <div class="card card--initiative card--mini">
-              <%= link_to decidim_initiatives.initiative_path(initiative), class: "card__link" do %>
-                <span class="show-for-sr"><%= translated_attribute initiative.title %></span>
-              <% end %>
+            <%= link_to decidim_initiatives.initiative_path(initiative), class: "card card--initiative card--mini" do %>
+              <span class="show-for-sr"><%= translated_attribute initiative.title %></span>
               <div class="card__content">
-                <%= link_to decidim_initiatives.initiative_path(initiative), class: "card__link" do %>
-                  <span class="card__title"><%= decidim_html_escape(translated_attribute(initiative.title)) %></span>
-                <% end %>
+                <span class="card__title card__link"><%= decidim_html_escape(translated_attribute(initiative.title)) %></span>
               </div>
-            </div>
+            <% end %>
           </div>
         <% end %>
       </div>

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_cell.rb

@@ -16,9 +16,13 @@ module Decidim
           model.settings.max_results
         end
 
+        def order
+          model.settings.order
+        end
+
         def highlighted_initiatives
           @highlighted_initiatives ||= OrganizationPrioritizedInitiatives
-                                       .new(current_organization)
+                                       .new(current_organization, order)
                                        .query
                                        .limit(max_results)
         end

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form/show.erb

@@ -1,3 +1,4 @@
 <% form.fields_for :settings, form.object.settings do |settings_fields| %>
-  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: label %>
+  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: max_results_label %>
+  <%= settings_fields.select :order, order_select, prompt: "", label: order_label %>
 <% end %>

data/app/cells/decidim/initiatives/content_blocks/highlighted_initiatives_settings_form_cell.rb

@@ -10,9 +10,20 @@ module Decidim
           options[:content_block]
         end
 
-        def label
+        def max_results_label
           I18n.t("decidim.initiatives.admin.content_blocks.highlighted_initiatives.max_results")
         end
+
+        def order_label
+          I18n.t("decidim.initiatives.admin.content_blocks.highlighted_initiatives.order.label")
+        end
+
+        def order_select
+          [
+            [I18n.t("decidim.initiatives.admin.content_blocks.highlighted_initiatives.order.default"), "default"],
+            [I18n.t("decidim.initiatives.admin.content_blocks.highlighted_initiatives.order.most_recent"), "most_recent"]
+          ]
+        end
       end
     end
   end

data/app/commands/decidim/initiatives/admin/update_initiative.rb

@@ -80,9 +80,9 @@ module Decidim
           attrs[:state] = form.state if form.state
           attrs[:decidim_area_id] = form.area_id
 
-          if initiative.published?
-            @notify_extended = true if form.signature_end_date != initiative.signature_end_date &&
-                                       form.signature_end_date > initiative.signature_end_date
+          if initiative.published? && form.signature_end_date != initiative.signature_end_date &&
+             form.signature_end_date > initiative.signature_end_date
+            @notify_extended = true
           end
         end
 

data/app/commands/decidim/initiatives/admin/update_initiative_answer.rb

@@ -53,9 +53,9 @@ module Decidim
             attrs[:signature_start_date] = form.signature_start_date
             attrs[:signature_end_date] = form.signature_end_date
 
-            if initiative.published?
-              @notify_extended = true if form.signature_end_date != initiative.signature_end_date &&
-                                         form.signature_end_date > initiative.signature_end_date
+            if initiative.published? && form.signature_end_date != initiative.signature_end_date &&
+               form.signature_end_date > initiative.signature_end_date
+              @notify_extended = true
             end
           end
 

data/app/commands/decidim/initiatives/approve_membership_request.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # A command with all the business logic that creates a new initiative.
+    class ApproveMembershipRequest < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # membership_request - A pending committee member
+      def initialize(membership_request)
+        @membership_request = membership_request
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      #
+      # Returns nothing.
+      def call
+        @membership_request.accepted!
+        notify_applicant
+
+        broadcast(:ok, @membership_request)
+      end
+
+      private
+
+      def notify_applicant
+        Decidim::EventsManager.publish(
+          event: "decidim.events.initiatives.approve_membership_request",
+          event_class: Decidim::Initiatives::ApproveMembershipRequestEvent,
+          resource: @membership_request.initiative,
+          affected_users: [@membership_request.user],
+          force_send: true,
+          extra: { author: @membership_request.initiative.author }
+        )
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -5,7 +5,7 @@ module Decidim
     # A command with all the business logic that creates a new initiative.
     class CreateInitiative < Rectify::Command
       include CurrentLocale
-      include AttachmentMethods
+      include ::Decidim::MultipleAttachmentsMethods
 
       # Public: Initializes the command.
       #
@@ -26,8 +26,8 @@ module Decidim
         return broadcast(:invalid) if form.invalid?
 
         if process_attachments?
-          build_attachment
-          return broadcast(:invalid) if attachment_invalid?
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
         end
 
         initiative = create_initiative
@@ -51,7 +51,8 @@ module Decidim
         initiative.transaction do
           initiative.save!
           @attached_to = initiative
-          create_attachment if process_attachments?
+          create_attachments if process_attachments?
+
           create_components_for(initiative)
           send_notification(initiative)
           add_author_as_follower(initiative)

data/app/commands/decidim/initiatives/revoke_membership_request.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # A command with all the business logic that creates a new initiative.
+    class RevokeMembershipRequest < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # membership_request - A pending committee member
+      def initialize(membership_request)
+        @membership_request = membership_request
+      end
+
+      # Executes the command. Broadcasts these events:
+      #
+      # - :ok when everything is valid.
+      #
+      # Returns nothing.
+      def call
+        @membership_request.rejected!
+        notify_applicant
+
+        broadcast(:ok, @membership_request)
+      end
+
+      private
+
+      def notify_applicant
+        Decidim::EventsManager.publish(
+          event: "decidim.events.initiatives.revoke_membership_request",
+          event_class: Decidim::Initiatives::RevokeMembershipRequestEvent,
+          resource: @membership_request.initiative,
+          affected_users: [@membership_request.user],
+          force_send: true,
+          extra: { author: @membership_request.initiative.author }
+        )
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/send_initiative_to_technical_validation.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # A command with all the business logic that sends an
+    # existing initiative to technical validation.
+    class SendInitiativeToTechnicalValidation < Rectify::Command
+      # Public: Initializes the command.
+      #
+      # initiative - Decidim::Initiative
+      # current_user - the user performing the action
+      def initialize(initiative, current_user)
+        @initiative = initiative
+        @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
+        @initiative = Decidim.traceability.perform_action!(
+          :send_to_technical_validation,
+          initiative,
+          current_user
+        ) do
+          initiative.validating!
+          initiative
+        end
+
+        notify_admins
+
+        broadcast(:ok, initiative)
+      end
+
+      private
+
+      attr_reader :initiative, :current_user
+
+      def notify_admins
+        affected_users = Decidim::User.org_admins_except_me(current_user).all
+
+        data = {
+          event: "decidim.events.initiatives.initiative_sent_to_technical_validation",
+          event_class: Decidim::Initiatives::InitiativeSentToTechnicalValidationEvent,
+          resource: initiative,
+          affected_users: affected_users,
+          force_send: true
+        }
+
+        Decidim::EventsManager.publish(data)
+      end
+    end
+  end
+end

data/app/commands/decidim/initiatives/spawn_committee_request.rb

@@ -26,6 +26,7 @@ module Decidim
         request = create_request
 
         if request.persisted?
+          notify_author
           broadcast(:ok, request)
         else
           broadcast(:invalid, request)
@@ -47,6 +48,23 @@ module Decidim
         request.save
         request
       end
+
+      def notify_author
+        return if initiative.author == current_user
+
+        Decidim::EventsManager.publish(
+          event: "decidim.events.initiatives.spawn_committee_request",
+          event_class: Decidim::Initiatives::SpawnCommitteeRequestEvent,
+          resource: initiative,
+          affected_users: [initiative.author],
+          force_send: true,
+          extra: { applicant: current_user }
+        )
+      end
+
+      def initiative
+        @initiative ||= Decidim::Initiative.find(form.initiative_id)
+      end
     end
   end
 end

data/app/commands/decidim/initiatives/update_initiative.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # A command with all the business logic that updates an
+    # existing initiative.
+    class UpdateInitiative < Rectify::Command
+      include ::Decidim::MultipleAttachmentsMethods
+      include CurrentLocale
+
+      # Public: Initializes the command.
+      #
+      # initiative - Decidim::Initiative
+      # form       - A form object with the params.
+      def initialize(initiative, form, current_user)
+        @form = form
+        @initiative = initiative
+        @current_user = current_user
+        @attached_to = initiative
+      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
+        return broadcast(:invalid) if form.invalid?
+
+        if process_attachments?
+          @initiative.attachments.where(id: form.documents).destroy_all
+
+          build_attachments
+          return broadcast(:invalid) if attachments_invalid?
+        end
+        @initiative = Decidim.traceability.update!(
+          initiative,
+          current_user,
+          attributes
+        )
+
+        create_attachments if process_attachments?
+        broadcast(:ok, initiative)
+      rescue ActiveRecord::RecordInvalid
+        broadcast(:invalid, initiative)
+      end
+
+      private
+
+      attr_reader :form, :initiative, :current_user
+
+      def attributes
+        attrs = {
+          title: { current_locale => form.title },
+          description: { current_locale => form.description },
+          hashtag: form.hashtag
+        }
+
+        if form.signature_type_updatable?
+          attrs[:signature_type] = form.signature_type
+          attrs[:scoped_type_id] = form.scoped_type_id if form.scoped_type_id
+        end
+
+        if initiative.created?
+          attrs[:signature_end_date] = form.signature_end_date if initiative.custom_signature_end_date_enabled?
+          attrs[:decidim_area_id] = form.area_id if initiative.area_enabled?
+        end
+
+        attrs
+      end
+    end
+  end
+end

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