decidim-initiatives 0.24.1 → 0.25.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1824560912284adcc53dd8e0d131c3fc3b411bb2d13df564d5fc22d52a72a0e0
-  data.tar.gz: 456a28502a052fcd81d7132df7df5472692a14f0c00c4e7f6f39844f204ebb8a
+  metadata.gz: e7bd82dc40292609012e7120b7cef37c0f2b3aaa85f4442724bd83d020ffd99f
+  data.tar.gz: 540b49a62f99907c409bbd367b4c7453ae72c3dbf09621560f22242357272880
 SHA512:
-  metadata.gz: 113e7ab02ea1d87bf7ff5f94e11b489570e17f14cb955c17cd9a7467c4ad1eab9eeb9470c2880b24cc096774013ef910288fce99e4456960eff43997ff07dff2
-  data.tar.gz: 3e4a170fc1ae65c20736abc0364683413680cc0d638ab251e2862d6959e68c91784d9d4df37f435b65c41d2f5728c6b65a3bf5e9933730b7cfed14a4dbca0b8a
+  metadata.gz: 4e7da10cc293557c3041ee48e48f7fb46c2d42788cff680934765ac7ec17c3428c87bf131bb382939bf8ce808327b8de062d850f1a91f1622beab85fe7961e4d
+  data.tar.gz: 339d5c0b27442b1a449c2893b33037162a11ce3ea37903cd4dbffb21e377ad5e594f7f22f0735baa669efd49a80a95f21c9f8a26539d2551109df21077cb730f

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/queries/decidim/initiatives/admin/admin_users.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     module Admin
-      # A class used to find the admins for an initiative.
+      # A class used to find the admins for an initiative or an organization initiatives.
       class AdminUsers < Rectify::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
@@ -12,27 +12,32 @@ module Decidim
           new(initiative).query
         end
 
+        # Syntactic sugar to initialize the class and return the queried objects.
+        #
+        # organization - an organization that needs to find its initiative admins
+        def self.for_organization(organization)
+          new(nil, organization).query
+        end
+
         # Initializes the class.
         #
         # initiative - Decidim::Initiative
-        def initialize(initiative)
+        # organization - an organization that needs to find its initiative admins
+        def initialize(initiative, organization = nil)
           @initiative = initiative
+          @organization = initiative&.organization || organization
         end
 
         # Finds organization admins and the users with role admin for the given initiative.
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins)
+          organization.admins
         end
 
         private
 
-        attr_reader :initiative
-
-        def organization_admins
-          initiative.organization.admins
-        end
+        attr_reader :initiative, :organization
       end
     end
   end