decidim-participatory_processes 0.21.0 → 0.23.2

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(content_tag(:input, nil, type: :hidden, id: :"metrics-space_type", value: participatory_process.class))
-          concat(content_tag(:input, nil, type: :hidden, id: :"metrics-space_id", value: participatory_process.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

@@ -49,8 +49,8 @@ module Decidim
       end
 
       def endorsements_query
-        Decidim::Proposals::ProposalEndorsement
-          .where(proposal: proposals_components)
+        Decidim::Endorsement
+          .where(resource: space_components)
           .pluck(:decidim_author_id)
           .uniq
       end
@@ -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_process_steps/_participatory_process_step.html.erb

@@ -7,7 +7,7 @@
       <span class="timeline__date text-small">
         <%= participatory_space_helpers.step_dates(participatory_process_step) %>
       </span>
-      <h6 class="timeline__title heading6"><%= translated_attribute(participatory_process_step.title) %></h6>
+      <h4 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h4>
     </div>
     <div class="timeline__content">
       <%= translated_attribute(participatory_process_step.description).html_safe %>

data/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb

@@ -1,6 +1,7 @@
+<% add_decidim_page_title(translated_attribute(group.name)) %>
 <% add_decidim_meta_tags(title: t("participatory_process_groups.show.title", scope: "decidim")) %>
 
-<main class="wrapper">
+<div class="wrapper">
   <section id="processes-grid" class="section row collapse">
     <h1 class="section-heading"><%= t("participatory_process_groups.show.group_participatory_processes", scope: "decidim", count: participatory_processes.count, group: translated_attribute(group.name)) %></h1>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
@@ -8,4 +9,4 @@
     </div>
   </section>
   <%= render_participatory_processes_hook(:process_group_highlighted_elements) %>
-</main>
+</div>

data/app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb

@@ -1,14 +1,19 @@
 <% add_decidim_page_title(t("participatory_process_steps.index.title", scope: "decidim")) %>
 
-<main class="steps">
+<div class="steps">
   <div class="row column">
     <div class="row">
       <div class="columns mediumlarge-9 large-7">
         <div class="section">
-          <h4 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h4>
+          <%= link_to participatory_process_path(current_participatory_space), class: "small hollow" do %>
+            <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+            <%= t(".back_to_process") %>
+          <% end %>
+
+          <h3 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
           <%= render partial: "timeline" %>
         </div>
       </div>
     </div>
   </div>
-</main>
+</div>

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

@@ -1,5 +1,5 @@
 <div class="section" id="metrics">
-  <h4 class="section-heading"><%= t("decidim.pages.participatory_space.metrics.headline", name: translated_attribute(current_participatory_space.title)) %></h4>
+  <h3 class="section-heading"><%= t("decidim.pages.participatory_space.metrics.headline", name: translated_attribute(current_participatory_space.title)) %></h3>
   <%= metrics.params %>
   <div class="row mb-sm">
     <%= metrics.highlighted %>

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

@@ -1,12 +1,13 @@
-<article class="card card--full card--process">
+<div class="card card--full card--process">
   <div class="row collapse card--process__row">
     <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"><%= 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 secondary small hollow card__button" do %>
+        <%= link_to participatory_process_path(promoted_process), class: "button small hollow card__button" do %>
+          <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(promoted_process.title)) %></span>
           <%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
         <% end %>
       </div>
@@ -16,8 +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 %>
-              <%= t(promoted_process.cta_button_text_key, scope: "layouts.decidim.participatory_processes.promoted_process") %>
+            <%= 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 %>
@@ -29,4 +36,4 @@
       </div>
     </div>
   </div>
-</article>
+</div>

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

@@ -1,17 +1,17 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_space.hero_image.url,
-  description: translated_attribute(current_participatory_space.short_description),
-  url: participatory_process_url(current_participatory_space),
-  twitter_handler: current_organization.twitter_handler
-}) %>
+                           image_url: current_participatory_space.hero_image.url,
+                           description: translated_attribute(current_participatory_space.short_description),
+                           url: participatory_process_url(current_participatory_space),
+                           twitter_handler: current_organization.twitter_handler
+                         }) %>
 
 <%
-edit_link(
-  resource_locator(current_participatory_space).edit,
-  :update,
-  :process,
-  process: current_participatory_space
-)
+  edit_link(
+    resource_locator(current_participatory_space).edit,
+    :update,
+    :process,
+    process: current_participatory_space
+  )
 %>
 
 <%= participatory_space_floating_help %>
@@ -48,6 +48,18 @@ edit_link(
           </div>
         </div>
       <% end %>
+
+      <% if linked_assemblies.any? %>
+        <div class="section">
+          <h4 class="section-heading"><%= t("participatory_process.show.related_assemblies", scope: "decidim") %></h4>
+          <div class="row small-up-1 medium-up-2 card-grid">
+            <% linked_assemblies.each do |linked_assembly| %>
+              <%= card_for(linked_assembly) %>
+            <% end %>
+          </div>
+        </div>
+      <% end %>
+
     </div>
     <div class="section columns medium-5 mediumlarge-4 large-3">
       <div class="card extra">
@@ -126,7 +138,7 @@ edit_link(
       </div>
       <%= resource_reference(current_participatory_space) %>
       <%= render partial: "decidim/shared/share_modal" %>
-      <%= embed_modal_for participatory_process_participatory_process_widget_url(current_participatory_space, format: :js) %>
+      <%= embed_modal_for participatory_process_widget_url(current_participatory_space, format: :js) %>
     </div>
   </div>
 

data/app/views/layouts/decidim/_process_header.html.erb

@@ -14,7 +14,7 @@
           <h2 class="text-highlight heading-small">
             <% if current_participatory_space.hashtag.present? %>
               <span class="process-header__hashtag">
-                <%= link_to "##{current_participatory_space.hashtag}", "https://twitter.com/hashtag/#{current_participatory_space.hashtag}", target: "_blank" %>
+                <%= link_to "##{decidim_html_escape(current_participatory_space.hashtag)}", "https://twitter.com/hashtag/#{decidim_html_escape(current_participatory_space.hashtag)}", target: "_blank" %>
               </span>
             <% end %>
             <%= translated_attribute(current_participatory_space.subtitle) %>

data/app/views/layouts/decidim/_process_header_steps.html.erb

@@ -30,7 +30,7 @@
           class: "button small button--sc show-for-medium"
         ) %>
       <% else %>
-        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space), class: "button small button--sc show-for-medium" %>
+        <%= link_to t(".view_steps"), decidim_participatory_processes.participatory_process_participatory_process_steps_path(current_participatory_space) %>
       <% end %>
     </div>
   </div>

data/app/views/layouts/decidim/participatory_process.html.erb

@@ -7,6 +7,7 @@
 
 <%= render "layouts/decidim/application" do %>
   <%= render partial: "layouts/decidim/process_header" %>
+  <%= cell "decidim/translation_bar", current_organization %>
   <div class="wrapper">
     <%= yield %>
   </div>

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/bg-BG.yml

@@ -0,0 +1,19 @@
+bg:
+  activemodel:
+    attributes:
+      participatory_process:
+        announcement: Обявление
+        area_id: Район
+        banner_image: Банер изображение
+        copy_categories: Копирай категории
+        copy_components: Копирай компоненти
+        copy_steps: Копирай стъпки
+        decidim_area_id: Район
+        description: Описание
+        developer_group: Група за популяризиране
+        domain: Домейн
+        end_date: Крайна дата
+        hashtag: Хаштаг
+        hero_image: Изображение за начална страница
+        local_area: Район на организацията
+        meta_scope: Метаданни сфера