decidim-initiatives 0.24.0 → 0.25.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 557c6b43a7cda759d2aefa2b9893893e336ccef62cc3533f19df7902ade4694b
-  data.tar.gz: fa9a227e8937d5f8b42ee55505ef04b471f85630b3a265ddd655feab095c7d48
+  metadata.gz: 030de12860861c98798c28592807e837e9069eab51efba83f1d84f646361f66a
+  data.tar.gz: aeb989682d1c94cae4b9d702d45626ee5aa9ac79897a6d5b1259f91def3cbfb3
 SHA512:
-  metadata.gz: b835b100231867c4ee8a0dbbe93fbecf67f98bc032dca5319d02ae5aacc32b5aef64a7cbe044263825d9fcb09909a8ba11e51e740a8ebfb608de0f88872b2e03
-  data.tar.gz: 2987d8c74edf38e2e5be4e103fe667ae3d153d591f13e88ab011d6e9e8f0a42e5642aeacf629181083df616e9251bf91ba241b56ec9c948532a5b40e63f618d3
+  metadata.gz: a065f653e0aa5a170cbbda2c2f361c1f4dbd960b611458a40acf2f33653038ecd985800c684314050b79a35cf2d1fbe57b892883c692c8230a4434be3e58c194
+  data.tar.gz: 7ece21753bd0f8579465ccbad6808597e35a5edd2381da73f49696931cb50792f45892eecdb5e244ec99ed35fc2211d106b8b781d02648fb7ebd73da9d4f4c37

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

@@ -6,6 +6,8 @@
         <% highlighted_initiatives.each do |initiative| %>
           <div class="column">
             <%= link_to decidim_initiatives.initiative_path(initiative), class: "card card--initiative card--mini" do %>
+              <div aria-hidden="true" class="card__image-top"
+                style="background-image:url(<%= initiative.banner_image.path %>)"></div>
               <span class="show-for-sr"><%= translated_attribute initiative.title %></span>
               <div class="card__content">
                 <span class="card__title card__link"><%= decidim_html_escape(translated_attribute(initiative.title)) %></span>

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

@@ -65,9 +65,7 @@ module Decidim
       end
 
       def image
-        @image ||= model.attachments.find do |attachment|
-          attachment.file.content_type.start_with?("image")
-        end
+        @image ||= model.attachments.find(&:image?)
       end
 
       def resource_image_path

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

@@ -12,7 +12,8 @@ module Decidim
         @attachment = Attachment.new(
           title: { I18n.locale => @form.attachment.title },
           attached_to: attached_to,
-          file: @form.attachment.file # Define attached_to before this
+          file: @form.attachment.file, # Define attached_to before this
+          content_type: @form.attachment.file.content_type
         )
       end
 

data/app/controllers/concerns/decidim/initiatives/admin/initiative_admin.rb

@@ -19,6 +19,13 @@ module Decidim
           participatory_space_admin_layout
 
           alias_method :current_participatory_space, :current_initiative
+          alias_method :current_participatory_space_manifest, :initiatives_manifest
+        end
+
+        private
+
+        def initiatives_manifest
+          @initiatives_manifest ||= Decidim.find_participatory_space_manifest(:initiatives)
         end
       end
     end

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

@@ -12,6 +12,7 @@ module Decidim
         include Decidim::Initiatives::TypeSelectorOptions
         include Decidim::Initiatives::Admin::Filterable
 
+        helper ::Decidim::Admin::ResourcePermissionsHelper
         helper Decidim::Initiatives::InitiativeHelper
         helper Decidim::Initiatives::CreateInitiativeHelper
 
@@ -125,7 +126,12 @@ module Decidim
         def export
           enforce_permission_to :export, :initiatives
 
-          Decidim::Initiatives::ExportInitiativesJob.perform_later(current_user, params[:format] || default_format)
+          Decidim::Initiatives::ExportInitiativesJob.perform_later(
+            current_user,
+            current_organization,
+            params[:format] || default_format,
+            params[:collection_ids].presence&.map(&:to_i)
+          )
 
           flash[:notice] = t("decidim.admin.exports.notice")
 

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      # Controller that allows managing initiatives
+      # permissions in the admin panel.
+      class InitiativesPermissionsController < Decidim::Admin::ResourcePermissionsController
+        include Decidim::Initiatives::NeedsInitiative
+
+        layout "decidim/admin/initiatives"
+
+        register_permissions(::Decidim::Initiatives::Admin::InitiativesPermissionsController,
+                             ::Decidim::Initiatives::Permissions,
+                             ::Decidim::Admin::Permissions)
+
+        def resource
+          current_initiative
+        end
+
+        def permission_class_chain
+          ::Decidim.permissions_registry.chain_for(::Decidim::Initiatives::Admin::InitiativesPermissionsController)
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_dependency "decidim/initiatives/admin/application_controller"
-
 module Decidim
   module Initiatives
     module Admin

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

@@ -114,6 +114,10 @@ module Decidim
         @current_participatory_space ||= Initiative.find_by(id: id_from_slug(params[:slug]))
       end
 
+      def current_participatory_space_manifest
+        @current_participatory_space_manifest ||= Decidim.find_participatory_space_manifest(:initiatives)
+      end
+
       def initiatives
         @initiatives = search.results.includes(:scoped_type)
         @initiatives = reorder(@initiatives)

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

@@ -15,6 +15,12 @@ module Decidim
       def versioned_resource
         current_initiative
       end
+
+      private
+
+      def current_participatory_space_manifest
+        @current_participatory_space_manifest ||= Decidim.find_participatory_space_manifest(:initiatives)
+      end
     end
   end
 end

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

@@ -32,9 +32,13 @@ module Decidim
         validates :attachments_enabled, :undo_online_signatures_enabled, :custom_signature_end_date_enabled,
                   :area_enabled, :promoting_committee_enabled, inclusion: { in: [true, false] }
         validates :minimum_committee_members, numericality: { only_integer: true }, allow_nil: true
-        validates :banner_image, presence: true, if: ->(form) { form.context.initiative_type.nil? }
+        validates :banner_image, presence: true, if: ->(form) { !form.persisted? && form.context.initiative_type.nil? }
         validates :document_number_authorization_handler, presence: true, if: ->(form) { form.collect_user_extra_fields? }
 
+        validates :banner_image, passthru: { to: Decidim::InitiativesType }
+
+        alias organization current_organization
+
         def minimum_committee_members=(value)
           super(value.presence)
         end

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

@@ -115,7 +115,8 @@ module Decidim
 
         attachment = Attachment.new(
           attached_to: attachment.try(:attached_to),
-          file: attachment.try(:file)
+          file: attachment.try(:file),
+          content_type: attachment.try(:file)&.content_type
         )
 
         errors.add(:attachment, :file) if !attachment.save && attachment.errors.has_key?(:file)

data/app/helpers/decidim/initiatives/admin/initiatives_helper.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    module Admin
+      module InitiativesHelper
+        def export_dropdown(collection_ids = nil)
+          render partial: "decidim/initiatives/admin/exports/dropdown", locals: { collection_ids: collection_ids }
+        end
+
+        def export_dropdowns(query)
+          return export_dropdown if query.conditions.empty?
+
+          export_dropdown.concat(export_dropdown(query.result.map(&:id)))
+        end
+
+        def dropdown_id(collection_ids)
+          return "export-dropdown" if collection_ids.blank?
+
+          "export-selection-dropdown"
+        end
+      end
+    end
+  end
+end

data/app/jobs/decidim/initiatives/export_initiatives_job.rb

@@ -3,18 +3,25 @@
 module Decidim
   module Initiatives
     class ExportInitiativesJob < ApplicationJob
-      queue_as :default
+      queue_as :exports
 
-      def perform(user, format)
-        export_data = Decidim::Exporters.find_exporter(format).new(collection, serializer).export
+      def perform(user, organization, format, collection_ids = nil)
+        export_data = Decidim::Exporters.find_exporter(format).new(
+          collection_to_export(collection_ids, organization),
+          serializer
+        ).export
 
         ExportMailer.export(user, "initiatives", export_data).deliver_now
       end
 
       private
 
-      def collection
-        Decidim::Initiative.all
+      def collection_to_export(ids, organization)
+        collection = Decidim::Initiative.where(organization: organization)
+
+        collection = collection.where(id: ids) if ids.present?
+
+        collection.order(id: :asc)
       end
 
       def serializer

data/app/models/decidim/initiative.rb

@@ -21,6 +21,7 @@ module Decidim
     include Decidim::Searchable
     include Decidim::Initiatives::HasArea
     include Decidim::TranslatableResource
+    include Decidim::HasResourcePermission
 
     translatable_fields :title, :description, :answer
 
@@ -124,15 +125,18 @@ module Decidim
       Decidim::Initiatives::AdminLog::InitiativePresenter
     end
 
+    delegate :document_number_authorization_handler, :promoting_committee_enabled?, to: :type
+    delegate :type, :scope, :scope_name, to: :scoped_type, allow_nil: true
+
     # PUBLIC banner image
     #
     # Overrides participatory space's banner image with the banner image defined
     # for the initiative type.
     #
-    # RETURNS string
-    delegate :banner_image, to: :type
-    delegate :document_number_authorization_handler, :promoting_committee_enabled?, to: :type
-    delegate :type, :scope, :scope_name, to: :scoped_type, allow_nil: true
+    # RETURNS Decidim::BannerImageUploader
+    def banner_image
+      type.attached_uploader(:banner_image)
+    end
 
     # PUBLIC
     #
@@ -177,17 +181,6 @@ module Decidim
       user_group&.name || author.name
     end
 
-    # PUBLIC author_avatar_url
-    #
-    # Returns the author's avatar URL. In case it is not defined the method
-    # falls back to decidim/default-avatar.svg
-    #
-    # RETURNS STRING
-    def author_avatar_url
-      author.avatar&.url ||
-        ActionController::Base.helpers.asset_path("decidim/default-avatar.svg")
-    end
-
     def votes_enabled?
       published? &&
         signature_start_date <= Date.current &&
@@ -410,6 +403,10 @@ module Decidim
       committee_members.approved.count >= minimum_committee_members
     end
 
+    def component
+      nil
+    end
+
     # PUBLIC
     #
     # Checks if the type the initiative belongs to enables SMS code
@@ -428,6 +425,15 @@ module Decidim
       Decidim::ParticipatorySpaceRoleConfig::Base.new(:empty_role_name)
     end
 
+    # Public: Overrides the `allow_resource_permissions?` Resourceable concern method.
+    def allow_resource_permissions?
+      true
+    end
+
+    def user_allowed_to_comment?(user)
+      ActionAuthorizer.new(user, "comment", self, nil).authorize.ok?
+    end
+
     private
 
     # Private: This is just an alias because the naming on InitiativeTypeScope

data/app/models/decidim/initiatives_type.rb

@@ -5,6 +5,7 @@ module Decidim
   class InitiativesType < ApplicationRecord
     include Decidim::HasResourcePermission
     include Decidim::TranslatableResource
+    include Decidim::HasUploadValidations
 
     translatable_fields :title, :description, :extra_fields_legal_information
 
@@ -27,7 +28,8 @@ module Decidim
     validates :title, :description, :signature_type, presence: true
     validates :document_number_authorization_handler, presence: true, if: ->(form) { form.collect_user_extra_fields? }
 
-    mount_uploader :banner_image, Decidim::BannerImageUploader
+    has_one_attached :banner_image
+    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
 
     def allowed_signature_types_for_initiatives
       return %w(online offline any) if any_signature_type?

data/app/packs/entrypoints/decidim_initiatives.js

@@ -0,0 +1,6 @@
+import "src/decidim/initiatives/application"
+import "src/decidim/initiatives/identity_selector_dialog"
+import "src/decidim/initiatives/scoped_type"
+
+// Images
+require.context("../images", true)

data/app/packs/entrypoints/decidim_initiatives_admin.js

@@ -0,0 +1,3 @@
+import "src/decidim/initiatives/admin/initiatives_types"
+import "src/decidim/initiatives/admin/invite_users"
+import "src/decidim/initiatives/scoped_type"

data/app/packs/entrypoints/decidim_initiatives_initiatives_votes.js

@@ -0,0 +1 @@
+import "entrypoints/decidim_initiatives_initiatives_votes.scss"

data/app/packs/entrypoints/decidim_initiatives_initiatives_votes.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/initiatives/initiatives-votes.scss";

data/app/packs/entrypoints/decidim_initiatives_print.js

@@ -0,0 +1 @@
+import "entrypoints/decidim_initiatives_print.scss"

data/app/packs/entrypoints/decidim_initiatives_print.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/initiatives/print-initiative";

data/app/{assets/javascripts → packs/src}/decidim/initiatives/admin/invite_users.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-empty */
 
-(function () {
+$(() => {
   let inviteUsersButton = document.querySelector(".invite-users-link");
 
   if (inviteUsersButton !== null) {
@@ -20,4 +20,4 @@
       window.getSelection().removeAllRanges();
     });
   }
-}());
+});

data/app/packs/src/decidim/initiatives/application.js

@@ -0,0 +1,3 @@
+import "src/decidim/editor"
+import "src/decidim/initiatives/scoped_type"
+import "src/decidim/initiatives/identity_selector_dialog"

data/app/{assets/javascripts → packs/src}/decidim/initiatives/identity_selector_dialog.js

@@ -1,4 +1,4 @@
-$(document).ready(function () {
+$(() => {
   let button = $("#select-identity-button"),
       userIdentitiesDialog = $("#user-identities");
 
@@ -11,4 +11,4 @@ $(document).ready(function () {
       });
     });
   }
-});
+})

data/app/{assets/javascripts → packs/src}/decidim/initiatives/scoped_type.js

@@ -1,5 +1,5 @@
 /* eslint-disable camelcase */
-let controlSelector = function(source, prefix, currentValueKey) {
+const controlSelector = function(source, prefix, currentValueKey) {
   if (source.length) {
     let currentValue = source.data(currentValueKey),
         searchUrl = source.data(`${prefix}-search-url`),
@@ -27,7 +27,7 @@ let controlSelector = function(source, prefix, currentValueKey) {
   }
 };
 
-$(document).ready(function () {
+$(() => {
   let typeSelector = $("[data-scope-selector]");
   controlSelector(typeSelector, "scope", "scope-id");
   controlSelector(typeSelector, "signature-types", "signature-type");

data/app/{assets/stylesheet → packs/stylesheets}/decidim/initiatives/initiatives.scss

@@ -1,6 +1,6 @@
-@import "popularity_item";
-@import "statistics";
-@import "admin";
+@import "stylesheets/decidim/initiatives/popularity_item";
+@import "stylesheets/decidim/initiatives/statistics";
+@import "stylesheets/decidim/initiatives/admin";
 
 .ql-formats{
   .ql-video{

data/app/permissions/decidim/initiatives/permissions.rb

@@ -53,7 +53,7 @@ module Decidim
                       permission_action.action == :read
 
         return allow! if initiative.published? || initiative.rejected? || initiative.accepted?
-        return allow! if user && (initiative.has_authorship?(user) || user.admin?)
+        return allow! if user && authorship_or_admin?
 
         disallow!
       end
@@ -73,23 +73,25 @@ module Decidim
       end
 
       def edit_public_initiative?
-        allow! if permission_action.subject == :initiative &&
-                  permission_action.action == :edit
+        return unless permission_action.subject == :initiative &&
+                      permission_action.action == :edit
+
+        toggle_allow(initiative&.created? && authorship_or_admin?)
       end
 
       def update_public_initiative?
         return unless permission_action.subject == :initiative &&
                       permission_action.action == :update
 
-        toggle_allow(initiative.created?)
+        toggle_allow(initiative&.created? && authorship_or_admin?)
       end
 
       def creation_enabled?
         Decidim::Initiatives.creation_enabled && (
-          Decidim::Initiatives.do_not_require_authorization ||
+        Decidim::Initiatives.do_not_require_authorization ||
             UserAuthorizations.for(user).any? ||
             Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-        )
+      )
       end
 
       def request_membership?
@@ -114,10 +116,10 @@ module Decidim
           initiative.promoting_committee_enabled? &&
           !initiative.has_authorship?(user) &&
           (
-            Decidim::Initiatives.do_not_require_authorization ||
-            UserAuthorizations.for(user).any? ||
-            Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-          )
+          Decidim::Initiatives.do_not_require_authorization ||
+              UserAuthorizations.for(user).any? ||
+              Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
+        )
       end
 
       def vote_initiative?
@@ -182,9 +184,9 @@ module Decidim
 
       def can_user_support?(initiative)
         !initiative.offline_signature_type? && (
-          Decidim::Initiatives.do_not_require_authorization ||
-          UserAuthorizations.for(user).any?
-        )
+        Decidim::Initiatives.do_not_require_authorization ||
+            UserAuthorizations.for(user).any?
+      )
       end
 
       def initiative_committee_action?
@@ -212,9 +214,13 @@ module Decidim
 
       def allowed_to_send_to_technical_validation?
         initiative.created? && (
-          !initiative.created_by_individual? ||
-          initiative.enough_committee_members?
-        )
+        !initiative.created_by_individual? ||
+            initiative.enough_committee_members?
+      )
+      end
+
+      def authorship_or_admin?
+        initiative&.has_authorship?(user) || user.admin?
       end
     end
   end