decidim-initiatives 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54a55b3aaf36d56a260dd3eb95eb0527c7398dea0e0b24fb72ed53a8c38998be
-  data.tar.gz: 7f8cbf99f92122ad1b354c6f61e83d2d4eab0b0734a597c07f9aa82081f5a0c8
+  metadata.gz: 3b8f445bf921e23456c088a9097081b230c135895702492b00e1a82090e30594
+  data.tar.gz: d23c120502ebcbf584a1cb4d4d9b64e1e1a47b95b927bee0cb18fe1b2004c495
 SHA512:
-  metadata.gz: 62a06aa02e52618a4fefbf0d79e85a49752fdf8376c5556323ad736e4ed45a80ab349553ed35646e67155d9d074419e5a5a734f478c13e89a76cd33e9be34c4a
-  data.tar.gz: 12180f554999011b7ee4a6a6b7034e2f0510dd1c2ed827fd684a6600eda3d633294894dd974e53fae4c9c2aacec55fc80b7cd614d1cd18b0f42a09a2fc182e07
+  metadata.gz: 4f5001df366f376cc13834bfc04359daaafe2b9aee78e908077df91ae01bd085efe6273d722627f490fd2d37ec5f3d49cf021a05b0e603375b688878fd7d952d
+  data.tar.gz: 9e79d6508a39cfbba8fe44aef2e0fdcf939012d21720acc42b252bd62e68ea49b8ec6fdc0a8cba562f0841dc12b7016eae15e94c07d7ead2e72600b320cfabca

data/README.md

@@ -1,7 +1,7 @@
 # Decidim::Initiatives
 
-Initiatives is the place on Decidim's where citizens can promote a civic initiative. Unlike
-participatory processes that must be created by an administrator, Civic initiatives can be
+Initiatives is the place on Decidim's where participants can promote an initiative. Unlike
+participatory processes that must be created by an administrator, initiatives can be
 created by any user of the platform.
 
 An initiative will contain attachments and comments from other users as well.
@@ -100,7 +100,7 @@ a mechanism to validate that there are no duplicated signatures. To do so the en
 a functionality that allows exporting the online signatures to validate them against physical
 signatures.
 
-The signatures are exported as a hash string in order to preserve the identity of the signer together with her privacy.
+The signatures are exported as a hash string in order to preserve the identity of the signer together with their privacy.
 Each hash is composed with the following criteria:
 
 * Algorithm used: SHA1

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

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_initiatives" class="wrapper-home home-section">
   <div class="row" id="highlighted-initiatives">
     <h3 class="section-heading"><%= t("active_initiatives", scope: i18n_scope) %></h3>
     <div class="row collapse">

data/app/cells/decidim/initiatives/initiative_m/footer.erb

@@ -1,6 +1,6 @@
 <div class="card__footer card__footer--spaces">
   <div class="card__support">
-    <% if model.published? %>
+    <% if model.published? || model.rejected? || model.accepted? %>
       <div class="card__support__data">
         <%= cell(
           "decidim/progress_bar",

data/app/cells/decidim/initiatives/initiative_m/tags.erb

@@ -1,7 +1,7 @@
 <% if model.hashtag.present? %>
   <%= link_to(
     "##{hashtag}",
-    "https://twitter.com/hashtag/#{hashtag}",
+    twitter_hashtag_url(hashtag),
     class: "card__text--category",
     target: "_blank"
   ) %>

data/app/cells/decidim/initiatives/initiative_m_cell.rb

@@ -6,6 +6,7 @@ module Decidim
     # for an given instance of an Initiative
     class InitiativeMCell < Decidim::CardMCell
       include Decidim::Initiatives::Engine.routes.url_helpers
+      include Decidim::TwitterSearchHelper
 
       property :state
 

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

@@ -4,12 +4,13 @@ module Decidim
   module Initiatives
     module Admin
       # A command with all the business logic that creates a new initiative type
-      class CreateInitiativeType < Rectify::Command
+      class CreateInitiativeType < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
-        def initialize(form)
+        def initialize(form, user)
           @form = form
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -36,11 +37,14 @@ module Decidim
         attr_reader :form
 
         def create_initiative_type
-          initiative_type = InitiativesType.new(
+          initiative_type = Decidim.traceability.create!(
+            InitiativesType,
+            @user,
             organization: form.current_organization,
             title: form.title,
             description: form.description,
             signature_type: form.signature_type,
+            comments_enabled: form.comments_enabled,
             attachments_enabled: form.attachments_enabled,
             undo_online_signatures_enabled: form.undo_online_signatures_enabled,
             custom_signature_end_date_enabled: form.custom_signature_end_date_enabled,

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

@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     module Admin
       # A command with all the business logic that creates a new initiative type scope
-      class CreateInitiativeTypeScope < Rectify::Command
+      class CreateInitiativeTypeScope < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -26,8 +26,8 @@ module Decidim
           if initiative_type_scope.persisted?
             broadcast(:ok, initiative_type_scope)
           else
-            initiative_type_scope.errors.each do |attribute, error|
-              form.errors.add(attribute, error)
+            initiative_type_scope.errors.each do |error|
+              form.errors.add(error.attribute, error.message)
             end
 
             broadcast(:invalid)

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that publishes an
       # existing initiative.
-      class PublishInitiative < Rectify::Command
+      class PublishInitiative < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative - Decidim::Initiative

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that sends an
       # existing initiative to technical validation.
-      class SendInitiativeToTechnicalValidation < Rectify::Command
+      class SendInitiativeToTechnicalValidation < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative - Decidim::Initiative
@@ -51,7 +51,7 @@ module Decidim
             force_send: true
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
       end
     end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that unpublishes an
       # existing initiative.
-      class UnpublishInitiative < Rectify::Command
+      class UnpublishInitiative < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative - Decidim::Initiative

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that updates an
       # existing initiative.
-      class UpdateInitiative < Rectify::Command
+      class UpdateInitiative < Decidim::Command
         include Decidim::Initiatives::AttachmentMethods
 
         # Public: Initializes the command.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to answer
       # initiatives.
-      class UpdateInitiativeAnswer < Rectify::Command
+      class UpdateInitiativeAnswer < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative   - Decidim::Initiative

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

@@ -5,14 +5,17 @@ module Decidim
     module Admin
       # A command with all the business logic that updates an
       # existing initiative type.
-      class UpdateInitiativeType < Rectify::Command
+      class UpdateInitiativeType < Decidim::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # initiative_type: Decidim::InitiativesType
         # form - A form object with the params.
-        def initialize(initiative_type, form)
+        def initialize(initiative_type, form, user)
           @form = form
           @initiative_type = initiative_type
+          @user = user
         end
 
         # Executes the command. Broadcasts these events:
@@ -24,13 +27,15 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          initiative_type.update(attributes)
+          Decidim.traceability.perform_action!("update", initiative_type, @user) do
+            initiative_type.update(attributes)
 
-          if initiative_type.valid?
-            upate_initiatives_signature_type
-            broadcast(:ok, initiative_type)
-          else
-            broadcast(:invalid)
+            if initiative_type.valid?
+              update_initiatives_signature_type
+              broadcast(:ok, initiative_type)
+            else
+              broadcast(:invalid)
+            end
           end
         end
 
@@ -39,11 +44,12 @@ module Decidim
         attr_reader :form, :initiative_type
 
         def attributes
-          result = {
+          {
             title: form.title,
             description: form.description,
             signature_type: form.signature_type,
             attachments_enabled: form.attachments_enabled,
+            comments_enabled: form.comments_enabled,
             undo_online_signatures_enabled: form.undo_online_signatures_enabled,
             custom_signature_end_date_enabled: form.custom_signature_end_date_enabled,
             area_enabled: form.area_enabled,
@@ -55,13 +61,12 @@ module Decidim
             document_number_authorization_handler: form.document_number_authorization_handler,
             child_scope_threshold_enabled: form.child_scope_threshold_enabled,
             only_global_scope_enabled: form.only_global_scope_enabled
-          }
-
-          result[:banner_image] = form.banner_image unless form.banner_image.nil?
-          result
+          }.merge(
+            attachment_attributes(:banner_image)
+          )
         end
 
-        def upate_initiatives_signature_type
+        def update_initiatives_signature_type
           initiative_type.initiatives.signature_type_updatable.each do |initiative|
             initiative.update!(signature_type: initiative_type.signature_type)
           end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic that updates an
       # existing initiative type scope.
-      class UpdateInitiativeTypeScope < Rectify::Command
+      class UpdateInitiativeTypeScope < Decidim::Command
         # Public: Initializes the command.
         #
         # initiative_type: Decidim::InitiativesTypeScope

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # A command with all the business logic when updating initiatives
+      # settings in admin area.
+      class UpdateInitiativesSettings < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # initiatives_settings - A initiatives settings object to update.
+        # form - A form object with the params.
+        def initialize(initiatives_settings, form)
+          @initiatives_settings = initiatives_settings
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form or initiatives_settings isn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid? || initiatives_settings.invalid?
+
+          update_initiatives_settings!
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :initiatives_settings
+
+        def update_initiatives_settings!
+          Decidim.traceability.update!(
+            @initiatives_settings,
+            form.current_user,
+            initiatives_order: form.initiatives_order
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
-    class ApproveMembershipRequest < Rectify::Command
+    class ApproveMembershipRequest < Decidim::Command
       # Public: Initializes the command.
       #
       # membership_request - A pending committee member

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
-    class CreateInitiative < Rectify::Command
+    class CreateInitiative < Decidim::Command
       include CurrentLocale
       include ::Decidim::MultipleAttachmentsMethods
 

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic that creates a new initiative.
-    class RevokeMembershipRequest < Rectify::Command
+    class RevokeMembershipRequest < Decidim::Command
       # Public: Initializes the command.
       #
       # membership_request - A pending committee member

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

@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # A command with all the business logic that sends an
     # existing initiative to technical validation.
-    class SendInitiativeToTechnicalValidation < Rectify::Command
+    class SendInitiativeToTechnicalValidation < Decidim::Command
       # Public: Initializes the command.
       #
       # initiative - Decidim::Initiative
@@ -50,7 +50,7 @@ module Decidim
           force_send: true
         }
 
-        Decidim::EventsManager.publish(data)
+        Decidim::EventsManager.publish(**data)
       end
     end
   end

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

@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # A command with all the business logic that creates a new membership
     # request for the committee of an initiative.
-    class SpawnCommitteeRequest < Rectify::Command
+    class SpawnCommitteeRequest < Decidim::Command
       # Public: Initializes the command.
       #
       # form - Decidim::Initiative::CommitteeMemberForm

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic when a user or organization unvotes an initiative.
-    class UnvoteInitiative < Rectify::Command
+    class UnvoteInitiative < Decidim::Command
       # Public: Initializes the command.
       #
       # initiative   - A Decidim::Initiative object.

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

@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # A command with all the business logic that updates an
     # existing initiative.
-    class UpdateInitiative < Rectify::Command
+    class UpdateInitiative < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
       include ::Decidim::GalleryMethods
       include CurrentLocale

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

@@ -4,7 +4,7 @@ module Decidim
   module Initiatives
     # Command to check if mobile phone has an authorization and
     # deliver sms code
-    class ValidateMobilePhone < Rectify::Command
+    class ValidateMobilePhone < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A MobilePhoneForm.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # Command to check if sms code provided by user is valid
-    class ValidateSmsCode < Rectify::Command
+    class ValidateSmsCode < Decidim::Command
       # Public: Initializes the command.
       #
       # form - form containing confirmation_code.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     # A command with all the business logic when a user or organization votes an initiative.
-    class VoteInitiative < Rectify::Command
+    class VoteInitiative < Decidim::Command
       # Public: Initializes the command.
       #
       # form - A form object with the params.
@@ -101,13 +101,9 @@ module Decidim
           event: "decidim.events.initiatives.support_threshold_reached",
           event_class: Decidim::Initiatives::Admin::SupportThresholdReachedEvent,
           resource: initiative,
-          followers: organization_admins
+          followers: initiative.organization.admins
         )
       end
-
-      def organization_admins
-        Decidim::User.where(organization: initiative.organization, admin: true)
-      end
     end
   end
 end

data/app/controllers/concerns/decidim/initiatives/orderable.rb

@@ -37,6 +37,14 @@ module Decidim
             initiatives.order_randomly(random_seed)
           end
         end
+
+        def order
+          @order ||= detect_order(params[:order]) || current_initiatives_settings.initiatives_order || default_order
+        end
+
+        def current_initiatives_settings
+          @current_initiatives_settings ||= Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+        end
       end
     end
   end

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

@@ -22,11 +22,6 @@ module Decidim
           @initiatives = filtered_collection
         end
 
-        # GET /admin/initiatives/:id
-        def show
-          enforce_permission_to :read, :initiative, initiative: current_initiative
-        end
-
         # GET /admin/initiatives/:id/edit
         def edit
           enforce_permission_to :edit, :initiative, initiative: current_initiative
@@ -115,7 +110,7 @@ module Decidim
               redirect_to EngineRouter.main_proxy(current_initiative).initiatives_path(initiative_slug: nil), flash: {
                 notice: I18n.t(
                   "success",
-                  scope: %w(decidim initiatives admin initiatives edit)
+                  scope: "decidim.initiatives.admin.initiatives.edit"
                 )
               }
             end
@@ -163,7 +158,8 @@ module Decidim
           output = render_to_string(
             pdf: "votes_#{current_initiative.id}",
             layout: "decidim/admin/initiatives_votes",
-            template: "decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb"
+            template: "decidim/initiatives/admin/initiatives/export_pdf_signatures",
+            format: [:pdf]
           )
           output = pdf_signature_service.new(pdf: output).signed_pdf if pdf_signature_service
 

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # Controller used to manage the initiatives settings for the current
+      # organization.
+      class InitiativesSettingsController < Decidim::Initiatives::Admin::ApplicationController
+        layout "decidim/admin/initiatives"
+
+        # GET /admin/initiatives_settings/edit
+        def edit
+          enforce_permission_to :update, :initiatives_settings, initiatives_settings: current_initiatives_settings
+          @form = initiatives_settings_form.from_model(current_initiatives_settings)
+        end
+
+        # PUT /admin/initiatives_settings
+        def update
+          enforce_permission_to :update, :initiatives_settings, initiatives_settings: current_initiatives_settings
+
+          @form = initiatives_settings_form
+                  .from_params(params, initiatives_settings: current_initiatives_settings)
+
+          UpdateInitiativesSettings.call(current_initiatives_settings, @form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("initiatives_settings.update.success", scope: "decidim.admin")
+              redirect_to edit_initiatives_setting_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("initiatives_settings.update.error", scope: "decidim.admin")
+              render :edit
+            end
+          end
+        end
+
+        private
+
+        def current_initiatives_settings
+          @current_initiatives_settings ||= Decidim::InitiativesSettings.find_or_create_by!(organization: current_organization)
+        end
+
+        def initiatives_settings_form
+          form(Decidim::Initiatives::Admin::InitiativesSettingsForm)
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Decidim
           enforce_permission_to :create, :initiative_type
           @form = initiative_type_form.from_params(params)
 
-          CreateInitiativeType.call(@form) do
+          CreateInitiativeType.call(@form, current_user) do
             on(:ok) do |initiative_type|
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.create.success")
               redirect_to edit_initiatives_type_path(initiative_type)
@@ -55,7 +55,7 @@ module Decidim
           @form = initiative_type_form
                   .from_params(params, initiative_type: current_initiative_type)
 
-          UpdateInitiativeType.call(current_initiative_type, @form) do
+          UpdateInitiativeType.call(current_initiative_type, @form, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("decidim.initiatives.admin.initiatives_types.update.success")
               redirect_to edit_initiatives_type_path(current_initiative_type)
@@ -71,7 +71,10 @@ module Decidim
         # DELETE /admin/initiatives_types/:id
         def destroy
           enforce_permission_to :destroy, :initiative_type, initiative_type: current_initiative_type
-          current_initiative_type.destroy!
+
+          Decidim.traceability.perform_action!("delete", current_initiative_type, current_user) do
+            current_initiative_type.destroy!
+          end
 
           redirect_to initiatives_types_path, flash: {
             notice: I18n.t("decidim.initiatives.admin.initiatives_types.destroy.success")

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

@@ -28,7 +28,7 @@ module Decidim
             redirect_to initiatives_path, flash: {
               notice: I18n.t(
                 "success",
-                scope: %w(decidim initiatives committee_requests spawn)
+                scope: "decidim.initiatives.committee_requests.spawn"
               )
             }
           end

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

@@ -125,9 +125,9 @@ module Decidim
 
       def build_form(klass, parameters)
         @form = if single_initiative_type?
-                  form(klass).from_params(parameters.merge(type_id: current_organization_initiatives_type.first.id), extra_context)
+                  form(klass).from_params(parameters.except(:id).merge(type_id: current_organization_initiatives_type.first.id), extra_context)
                 else
-                  form(klass).from_params(parameters, extra_context)
+                  form(klass).from_params(parameters.except(:id), extra_context)
                 end
 
         attributes = @form.attributes_with_values