decidim-participatory_processes 0.22.0 → 0.23.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c87d3748ed5ddda107431eccbde08c257a669a9b0b6b87010cfc6dd1f6f5450
-  data.tar.gz: 5a984b08e37fb702a0f8cc425189782e7acc298fe0f933d02b68c2f171ec9106
+  metadata.gz: 8a7d9401a97e25072d4fa8d7d7c93c350bd317a73254a7e2af1e545069975091
+  data.tar.gz: 169180c333f2fd47ec242f0c97e20fef22d23d9cf0bcf3d8b70c5ba83c06fdf5
 SHA512:
-  metadata.gz: 04cb2351dd62f27e32155fe620953c7524216925686bef5be09d6fe30bfdebcdc12d45a79e577f414438c06cee0bc0a7f8396976386058bc2f40a21e5e21baa5
-  data.tar.gz: 30dbc6a09f4f3f5c5f417b0a1c9be50c4bca044b415aea17364dd9623bd86f4c188635528e87f74a9d4ed97a0cb8a0f8142eed1706415f3264118d9237585eb7
+  metadata.gz: d608d180a2b8a66432202f038fe96be994146e192d00dc7e43bea6289e5ddefd9092827660bdf4bcd56954892bee8f577abd1124c382a534448316f17d2cdb27
+  data.tar.gz: bd3297b8df7165257e95f8a0f99e5f4e3a24375713bd005ce99261a8d2f14e3363a18610fa4fabb2dcc6aff7d9c8236bc5efd17a5916eb4339c2d6d2642030e3

data/app/cells/decidim/participatory_processes/process_m/footer.erb

@@ -6,9 +6,9 @@
         <div class="text-ellipsis"><strong><%= step_title %></strong></div>
       </div>
     <% end %>
-    <%= link_to(resource_path, class: "card__button button button--sc small") do %>
-      <span class="show-for-sr"><%= t(model.cta_button_text_key_accessible, resource_name: title, scope: "layouts.decidim.participatory_processes.participatory_process") %></span>
-      <%= t(model.cta_button_text_key, scope: "layouts.decidim.participatory_processes.participatory_process") %>
+    <%= link_to(step_cta_path, class: "card__button button button--sc small") do %>
+      <span class="show-for-sr"><%= step_cta_text %></span>
+      <%= step_cta_text %>
     <% end %>
   </div>
 </div>

data/app/cells/decidim/participatory_processes/process_m_cell.rb

@@ -6,6 +6,7 @@ module Decidim
     # for an given instance of a Process
     class ProcessMCell < Decidim::CardMCell
       include Decidim::SanitizeHelper
+      include Decidim::TranslationsHelper
 
       private
 
@@ -39,6 +40,24 @@ module Decidim
         model.hero_image.url
       end
 
+      def step_cta_text
+        if translated_in_current_locale?(model.active_step&.cta_text)
+          translated_attribute(model.active_step.cta_text)
+        else
+          t(model.cta_button_text_key_accessible, resource_name: title, scope: "layouts.decidim.participatory_processes.participatory_process")
+        end
+      end
+
+      def step_cta_path
+        if model.active_step&.cta_path.present?
+          path, params = resource_path.split("?")
+
+          "#{path}/#{model.active_step.cta_path}" + (params.present? ? "?#{params}" : "")
+        else
+          resource_path
+        end
+      end
+
       def step_title
         translated_attribute model.active_step.title
       end

data/app/commands/decidim/participatory_processes/admin/create_participatory_process_group.rb

@@ -45,11 +45,11 @@ module Decidim
               form.current_user
             ) do
               ParticipatoryProcessGroup.create(
+                organization: form.current_organization,
                 name: form.name,
                 description: form.description,
-                hero_image: form.hero_image,
-                participatory_processes: participatory_processes,
-                organization: form.current_organization
+                hero_image: form.hero_image, # Keep after organization
+                participatory_processes: participatory_processes
               )
             end
           end

data/app/commands/decidim/participatory_processes/admin/update_participatory_process.rb

@@ -57,10 +57,6 @@ module Decidim
             subtitle: form.subtitle,
             slug: form.slug,
             hashtag: form.hashtag,
-            hero_image: form.hero_image,
-            remove_hero_image: form.remove_hero_image,
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image,
             promoted: form.promoted,
             description: form.description,
             short_description: form.short_description,
@@ -81,7 +77,16 @@ module Decidim
             show_metrics: form.show_metrics,
             show_statistics: form.show_statistics,
             announcement: form.announcement
-          }
+          }.merge(uploader_attributes)
+        end
+
+        def uploader_attributes
+          {
+            hero_image: form.hero_image,
+            remove_hero_image: form.remove_hero_image,
+            banner_image: form.banner_image,
+            remove_banner_image: form.remove_banner_image
+          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
         end
 
         def related_processes

data/app/controllers/decidim/participatory_processes/admin/participatory_process_exports_controller.rb

@@ -11,6 +11,10 @@ module Decidim
           current_participatory_process
         end
 
+        def manifest_name
+          current_participatory_process.manifest.name.to_s
+        end
+
         def after_export_path
           participatory_processes_path
         end

data/app/controllers/decidim/participatory_processes/admin/participatory_process_user_roles_controller.rb

@@ -25,12 +25,13 @@ module Decidim
           CreateParticipatoryProcessAdmin.call(@form, current_user, current_participatory_process) do
             on(:ok) do
               flash[:notice] = I18n.t("participatory_process_user_roles.create.success", scope: "decidim.admin")
+              redirect_to participatory_process_user_roles_path(current_participatory_process)
             end
 
             on(:invalid) do
               flash[:alert] = I18n.t("participatory_process_user_roles.create.error", scope: "decidim.admin")
+              render :new
             end
-            redirect_to participatory_process_user_roles_path(current_participatory_process)
           end
         end
 

data/app/controllers/decidim/participatory_processes/{participatory_process_widgets_controller.rb → widgets_controller.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module ParticipatoryProcesses
-    class ParticipatoryProcessWidgetsController < Decidim::WidgetsController
+    class WidgetsController < Decidim::WidgetsController
       helper Decidim::SanitizeHelper
 
       private
@@ -20,7 +20,7 @@ module Decidim
       end
 
       def iframe_url
-        @iframe_url ||= participatory_process_participatory_process_widget_url(model)
+        @iframe_url ||= participatory_process_widget_url(model)
       end
     end
   end

data/app/forms/decidim/participatory_processes/admin/participatory_process_form.rb

@@ -8,6 +8,7 @@ module Decidim
       #
       class ParticipatoryProcessForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         mimic :participatory_process
 
@@ -54,12 +55,10 @@ module Decidim
 
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
 
-        validates :banner_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
-        validates :hero_image,
-                  file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } },
-                  file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :banner_image, passthru: { to: Decidim::ParticipatoryProcess }
+        validates :hero_image, passthru: { to: Decidim::ParticipatoryProcess }
+
+        alias organization current_organization
 
         def map_model(model)
           self.scope_id = model.decidim_scope_id

data/app/forms/decidim/participatory_processes/admin/participatory_process_group_form.rb

@@ -8,6 +8,7 @@ module Decidim
       #
       class ParticipatoryProcessGroupForm < Form
         include TranslatableAttributes
+        include Decidim::HasUploadValidations
 
         translatable_attribute :name, String
         translatable_attribute :description, String
@@ -20,7 +21,9 @@ module Decidim
 
         validates :name, :description, translatable_presence: true
 
-        validates :hero_image, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
+        validates :hero_image, passthru: { to: Decidim::ParticipatoryProcessGroup }
+
+        alias organization current_organization
       end
     end
   end

data/app/forms/decidim/participatory_processes/admin/participatory_process_import_form.rb

@@ -13,6 +13,9 @@ module Decidim
         # Accepted mime types
         # keys: are used for dynamic help text on admin form.
         # values: are used to validate the file format of imported document.
+        #
+        # WARNING: consider adding/removing the relative translation key at
+        # decidim.participatory_processes.admin.new_import.accepted_types when modifying this hash
         ACCEPTED_TYPES = {
           json: JSON_MIME_TYPE
         }.freeze

data/app/forms/decidim/participatory_processes/admin/participatory_process_user_role_form.rb

@@ -13,10 +13,11 @@ module Decidim
         attribute :email, String
         attribute :role, String
 
-        validates :email, :role, presence: true
-        validates :name, presence: true
+        validates :name, :email, :role, presence: true
         validates :role, inclusion: { in: Decidim::ParticipatoryProcessUserRole::ROLES }
 
+        validates :name, format: { with: UserBaseEntity::REGEXP_NAME }
+
         def roles
           Decidim::ParticipatoryProcessUserRole::ROLES.map do |role|
             [

data/app/helpers/decidim/participatory_processes/participatory_process_helper.rb

@@ -21,6 +21,17 @@ module Decidim
         dates = [participatory_process_step.start_date, participatory_process_step.end_date]
         dates.map { |date| date ? localize(date.to_date, format: :default) : "?" }.join(" - ")
       end
+
+      # Public: Returns the path for the participatory process cta button
+      #
+      # Returns a String with path.
+      def participatory_process_cta_path(process)
+        return participatory_process_path(process) if process.active_step&.cta_path.blank?
+
+        path, params = participatory_process_path(process).split("?")
+
+        "#{path}/#{process.active_step.cta_path}" + (params.present? ? "?#{params}" : "")
+      end
     end
   end
 end

data/app/models/decidim/participatory_process.rb

@@ -11,7 +11,7 @@ module Decidim
     include Decidim::HasAttachmentCollections
     include Decidim::Participable
     include Decidim::Publicable
-    include Decidim::Scopable
+    include Decidim::ScopableParticipatorySpace
     include Decidim::Followable
     include Decidim::HasReference
     include Decidim::Traceable
@@ -19,6 +19,11 @@ module Decidim
     include Decidim::Loggable
     include Decidim::ParticipatorySpaceResourceable
     include Decidim::Searchable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :title, :subtitle, :short_description, :description, :developer_group, :meta_scope, :local_area,
+                        :target, :participatory_scope, :participatory_structure, :announcement
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -61,7 +66,10 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
+
+    validates_upload :banner_image
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
     scope :past, -> { where(arel_table[:end_date].lt(Date.current)) }
@@ -160,6 +168,10 @@ module Decidim
       roles.where(role: role_name)
     end
 
+    def attachment_context
+      :admin
+    end
+
     # Allow ransacker to search for a key in a hstore column (`title`.`en`)
     ransacker :title do |parent|
       Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))

data/app/models/decidim/participatory_process_group.rb

@@ -4,6 +4,10 @@ module Decidim
   class ParticipatoryProcessGroup < ApplicationRecord
     include Decidim::Resourceable
     include Decidim::Traceable
+    include Decidim::HasUploadValidations
+    include Decidim::TranslatableResource
+
+    translatable_fields :name, :description
 
     has_many :participatory_processes,
              foreign_key: "decidim_participatory_process_group_id",
@@ -15,6 +19,7 @@ module Decidim
                foreign_key: "decidim_organization_id",
                class_name: "Decidim::Organization"
 
+    validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
 
     def self.log_presenter_class_for(_log)

data/app/models/decidim/participatory_process_step.rb

@@ -5,9 +5,12 @@ module Decidim
   # components that will show up in the depending on what step is currently
   # active.
   class ParticipatoryProcessStep < ApplicationRecord
+    include Decidim::TranslatableResource
     include Traceable
     include Loggable
 
+    translatable_fields :title, :description, :cta_text
+
     belongs_to :participatory_process, foreign_key: "decidim_participatory_process_id", class_name: "Decidim::ParticipatoryProcess"
     has_one :organization, through: :participatory_process
 

data/app/permissions/decidim/participatory_processes/permissions.rb

@@ -233,6 +233,7 @@ module Decidim
           :process,
           :process_step,
           :process_user_role,
+          :space_private_user,
           :export_space,
           :import
         ].include?(permission_action.subject)

data/app/presenters/decidim/participatory_processes/admin_log/participatory_process_group_presenter.rb

@@ -35,8 +35,8 @@ module Decidim
           "activemodel.attributes.participatory_process_group"
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

data/app/presenters/decidim/participatory_processes/admin_log/participatory_process_presenter.rb

@@ -48,8 +48,8 @@ module Decidim
           "activemodel.attributes.participatory_process"
         end
 
-        def has_diff?
-          action == "unpublish" || super
+        def diff_actions
+          super + %w(unpublish)
         end
       end
     end

data/app/presenters/decidim/participatory_processes/admin_log/participatory_process_user_role_presenter.rb

@@ -31,8 +31,8 @@ module Decidim
           ).changeset
         end
 
-        def has_diff?
-          action == "delete" || super
+        def diff_actions
+          super + %w(delete)
         end
 
         def action_string

data/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb

@@ -8,8 +8,8 @@ module Decidim
 
       def params
         capture do
-          concat(hidden_field_tag(:metrics_space_type, value: participatory_process.class, id: :"metrics-space_type"))
-          concat(hidden_field_tag(:metrics_space_id, value: participatory_process.id, id: :"metrics-space_id"))
+          concat(hidden_field_tag(:metrics_space_type, participatory_process.class.name, id: :"metrics-space_type"))
+          concat(hidden_field_tag(:metrics_space_id, participatory_process.id, id: :"metrics-space_id"))
         end
       end
 

data/app/queries/decidim/participatory_processes/stats_participants_count.rb

@@ -76,10 +76,12 @@ module Decidim
       end
 
       def project_supports_query
-        Decidim::Budgets::Order
-          .where(component: space_components)
-          .pluck(:decidim_user_id)
-          .uniq
+        Decidim::Budgets::Order.joins(budget: [:component])
+                               .where(budget: {
+                                        decidim_components: { id: space_components.pluck(:id) }
+                                      })
+                               .pluck(:decidim_user_id)
+                               .uniq
       end
 
       def survey_answer_query

data/app/serializers/decidim/participatory_processes/participatory_process_importer.rb

@@ -122,11 +122,11 @@ module Decidim
             attachment = Attachment.new(
               title: file["title"],
               description: file["description"],
-              file: file_tmp,
-              file_size: file_tmp.size,
               content_type: file_tmp.content_type,
               attached_to: @imported_process,
-              weight: file["weight"]
+              weight: file["weight"],
+              file: file_tmp, # Define attached_to before this
+              file_size: file_tmp.size
             )
             attachment.create_attachment_collection(file["attachment_collection"])
             attachment.save!
@@ -169,7 +169,9 @@ module Decidim
 
         accepted = ["image", "application/pdf"]
         url = URI.parse(url)
-        Net::HTTP.start(url.host, url.port) do |http|
+        http_connection = Net::HTTP.new(url.host, url.port)
+        http_connection.use_ssl = true if url.scheme == "https"
+        http_connection.start do |http|
           return http.head(url.request_uri)["Content-Type"].start_with?(*accepted)
         end
       rescue StandardError

data/app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb

@@ -3,7 +3,7 @@
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card__content">
         <%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
-          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process.title)) %></h2>
+          <h2 class="card__title"><%= decidim_html_escape(translated_attribute(promoted_process.title)).html_safe %></h2>
         <% end %>
         <%= decidim_sanitize html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: "...") %>
         <%= link_to participatory_process_path(promoted_process), class: "button small hollow card__button" do %>
@@ -17,9 +17,14 @@
            style="background-image:url(<%= promoted_process.hero_image.url %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
-            <%= link_to participatory_process_path(promoted_process), class: "button expanded button--sc" do %>
-              <span class="show-for-sr"><%= t(promoted_process.cta_button_text_key_accessible, resource_name: translated_attribute(promoted_process.title), scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
-              <span aria-hidden="true"><%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
+            <%= link_to participatory_process_cta_path(promoted_process), class: "button expanded button--sc" do %>
+              <% if translated_in_current_locale?(promoted_process.active_step&.cta_text) %>
+                <span class="show-for-sr"><%= translated_attribute(promoted_process.active_step.cta_text) %></span>
+                <span aria-hidden="true"><%= translated_attribute(promoted_process.active_step.cta_text) %></span>
+              <% else %>
+                <span class="show-for-sr"><%= t(promoted_process.cta_button_text_key_accessible, resource_name: translated_attribute(promoted_process.title), scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
+                <span aria-hidden="true"><%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %></span>
+              <% end %>
               <% if promoted_process.active_step %>
                 <span class="button__info">
                   <%= t("participatory_processes.promoted_process.active_step", scope: "layouts.decidim") %> <%= translated_attribute promoted_process.active_step.title %>