decidim-participatory_processes 0.21.0 → 0.23.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d739759631aca0408a7ae0aba4ff332eae1e0f2f0da9687baa753fdecfb1882
-  data.tar.gz: 5db3ca8acfbc423b83176a45dd67bc6b24083824264b367ccdc7b603b1b8bb68
+  metadata.gz: 38e72fa7e13259672948879ddf6a81b9bac5c3e4a5142e241f4f07985f2a32ec
+  data.tar.gz: 88ef2a941db1312162b8b230de78cdb31b21ad0111a44d894224dd9b28ad7306
 SHA512:
-  metadata.gz: 71fd380d50a0bf51fac1e84ee82de34dae3c8412ddac11e7f102d91809f928af6c6d62e58c2809649067aeabcdbf8fb4992831a37876567f372901d177809b06
-  data.tar.gz: c33eca9c58ce8cb093178232584a70916ccc314920de56443475abf129363d94e0f8cd86840ad1ae29536cbadbb8252b490ddaa93ce88002e613fd6432d00e97
+  metadata.gz: ddbce1cc68b92a5e20e72b871adff38b27efd965405978ae0d668c914993348d5e22386d4453f2189b05dd5b6116cc94a4fc9d9e875f7de17a52542d815ce363
+  data.tar.gz: ba3b11ae17cff650877d48ff66975fd04fc939ca599db7b011d088fdd512db0e9cb8e53a92b90b0a36f455bfbf15d4880003d5a370300c6620bfae1bb7f133e2

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/_all_processes.erb

@@ -1,6 +1,9 @@
 <div class="row" id="see-all-processes">
   <div class="columns small-centered small-12
     smallmedium-8 medium-6 large-4">
-    <%= link_to t("see_all_processes", scope: i18n_scope), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
+    <%= link_to t("see_all_processes", scope: i18n_scope),
+                decidim_participatory_processes.participatory_processes_path,
+                class: "button expanded hollow button--sc home-section__cta",
+                title: t("processes_button_title", scope: i18n_scope) %>
   </div>
 </div>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb

@@ -6,15 +6,11 @@
         large-up-4 card-grid">
         <% highlighted_processes.each do |process| %>
           <div class="column">
-            <article class="card card--process card--mini">
-              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                <div class="card__image-top"
-                  style="background-image:url(<%= process.hero_image.url %>)"></div>
-              <% end %>
+            <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card card--process card--mini" do %>
+              <div aria-hidden="true" class="card__image-top"
+                style="background-image:url(<%= process.hero_image.url %>)"></div>
               <div class="card__content">
-                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                  <h4 class="card__title"><%= translated_attribute process.title %></h4>
-                <% end %>
+                <span class="card__title card__link"><%= translated_attribute process.title %></span>
                 <% if process.active_step %>
                   <span class="card--process__small">
                     <%= t("active_step", scope: i18n_scope) %>
@@ -22,7 +18,7 @@
                   </span>
                 <% end %>
               </div>
-            </article>
+            <% end %>
           </div>
         <% end %>
       </div>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb

@@ -1,17 +1,21 @@
 <% process = highlighted_processes.first %>
+<% title_id = "process_title" %>
 <section class="wrapper-home home-section">
   <div class="row" id="highlighted-processes">
     <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
     <div class="row collapse">
-      <article class="card card--full card--process">
+      <div class="card card--full card--process">
         <div class="row collapse card--process__row">
           <div class="column large-6 card--process__column">
             <div class="card__content">
               <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
-                <h2 class="card__title"><%= translated_attribute process.title %></h2>
+                <h2 class="card__title" id="<%= title_id %>"><%= decidim_html_escape(translated_attribute(process.title)) %></h2>
               <% end %>
               <%= decidim_sanitize translated_attribute(process.short_description) %>
-              <%= link_to t("more_information", scope: i18n_scope), decidim_participatory_processes.participatory_process_path(process), class: "button secondary small hollow" %>
+              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button small hollow" do %>
+                <span class="show-for-sr"><%= decidim_html_escape(translated_attribute(process.title)) %></span>
+                <%= t("more_information", scope: i18n_scope) %>
+              <% end %>
             </div>
           </div>
           <div class="column large-6 card--process__column">
@@ -19,7 +23,8 @@
               <div class="card__content row collapse">
                 <div class="large-6 large-offset-6 columns">
                   <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button expanded button--sc" do %>
-                    <%= t("participate", scope: i18n_scope) %>
+                    <span class="show-for-sr"><%= t("participate_in", resource_name: translated_attribute(process.title), scope: i18n_scope) %></span>
+                    <span aria-hidden="true"><%= t("participate", scope: i18n_scope) %></span>
                     <% if process.active_step %>
                       <span class="button__info">
                         <%= t("active_step", scope: i18n_scope) %>
@@ -32,7 +37,7 @@
             </div>
           </div>
         </div>
-      </article>
+      </div>
     </div>
   </div>
   <%= render "_all_processes" %>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb

@@ -29,7 +29,7 @@ module Decidim
             OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
             HighlightedParticipatoryProcesses.new |
             FilteredParticipatoryProcesses.new("active")
-          ).query.limit(max_results)
+          ).query.includes([:organization]).limit(max_results)
         end
 
         def i18n_scope

data/app/cells/decidim/participatory_processes/process_filters/show.erb

@@ -1,8 +1,8 @@
 <div class="row collapse order-by">
-  <h2 class="order-by__text section-heading">
+  <h3 class="order-by__text section-heading">
     <%= title %>
     <%= render :filter_tabs %>
-  </h2>
+  </h3>
 </div>
 <% if process_count_by_filter["active"] == 0 && process_count_by_filter["upcoming"] == 0 %>
 <div class="row column">

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

@@ -1,9 +1,8 @@
 <div class="card__footer card__footer--spaces">
   <div class="card__support">
-    <%= link_to(
-      t("layouts.decidim.participatory_process_groups.participatory_process_group.browse"),
-      resource_path,
-      class: "card__button button button--sc secondary light small"
-    ) %>
+    <%= link_to(resource_path, class: "card__button button button--sc small") do %>
+      <span class="show-for-sr"><%= t("browse_resource", resource_name: title, scope: "layouts.decidim.participatory_process_groups.participatory_process_group") %></span>
+      <%= t("layouts.decidim.participatory_process_groups.participatory_process_group.browse") %>
+    <% end %>
   </div>
 </div>

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

@@ -1,7 +1,7 @@
 <div class="card__icondata">
   <ul class="card-data">
     <li class="card-data__item">
-      <%= icon "datetime", class: "icon--big" %>
+      <%= icon "datetime", class: "icon--big", role: "img", aria_label: t("decidim.participatory_processes.show.dates") %>
     </li>
     <li class="card-data__item">
       <div class="card-data__item--centerblock">

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

@@ -2,14 +2,13 @@
   <div class="card__support">
     <% if has_step? %>
       <div class="card__support__data--left">
-        <div class="text-uppercase"><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></div>
+        <div><%= t("layouts.decidim.participatory_processes.participatory_process.active_step") %></div>
         <div class="text-ellipsis"><strong><%= step_title %></strong></div>
       </div>
     <% end %>
-    <%= link_to(
-      t(model.cta_button_text_key, scope: "layouts.decidim.participatory_processes.participatory_process"),
-      resource_path,
-      class: "card__button button button--sc secondary light small"
-    ) %>
+    <%= 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/tags.erb

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

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

@@ -5,6 +5,9 @@ module Decidim
     # This cell renders the Medium (:m) process card
     # for an given instance of a Process
     class ProcessMCell < Decidim::CardMCell
+      include Decidim::SanitizeHelper
+      include Decidim::TranslationsHelper
+
       private
 
       def has_image?
@@ -37,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/cells/decidim/participatory_processes/statistics/show.erb

@@ -1,9 +1,9 @@
 <section class="row statistics" id="participatory_process-statistics">
   <div class="columns large-8">
     <div class="row column">
-      <h4 class="section-heading">
+      <h3 class="section-heading">
         <%= stats_heading %>
-      </h4>
+      </h3>
 
       <div class="process-stats">
         <% if model.present? %>

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # process admin in the system.
-      class CreateParticipatoryProcessAdmin < Rectify::Command
+      class CreateParticipatoryProcessAdmin < NotifyRoleAssignedToParticipatoryProcess
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -61,6 +61,7 @@ module Decidim
             role_params,
             extra_info
           )
+          send_notification user
         end
 
         def existing_role

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/notify_role_assigned_to_participatory_process.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module Admin
+      # A command to notify users when a role is assigned for a participatory process
+      class NotifyRoleAssignedToParticipatoryProcess < Rectify::Command
+        def send_notification(user)
+          Decidim::EventsManager.publish(
+            event: "decidim.events.participatory_process.role_assigned",
+            event_class: Decidim::ParticipatoryProcessRoleAssignedEvent,
+            resource: form.current_participatory_space,
+            affected_users: [user],
+            extra: {
+              role: form.role
+            }
+          )
+        end
+      end
+    end
+  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/commands/decidim/participatory_processes/admin/update_participatory_process_admin.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updated a participatory
       # process admin in the system.
-      class UpdateParticipatoryProcessAdmin < Rectify::Command
+      class UpdateParticipatoryProcessAdmin < NotifyRoleAssignedToParticipatoryProcess
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -47,6 +47,8 @@ module Decidim
             { role: form.role },
             extra_info
           )
+
+          send_notification user_role.user
         end
       end
     end

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_processes_controller.rb

@@ -15,7 +15,8 @@ module Decidim
                     :stats,
                     :metrics,
                     :default_date_filter,
-                    :related_processes
+                    :related_processes,
+                    :linked_assemblies
 
       def index
         raise ActionController::RoutingError, "Not Found" if published_processes.none?
@@ -29,7 +30,11 @@ module Decidim
       end
 
       def all_metrics
-        enforce_permission_to :read, :process, process: current_participatory_space
+        if current_participatory_space.show_statistics
+          enforce_permission_to :read, :process, process: current_participatory_space
+        else
+          render status: :not_found
+        end
       end
 
       private
@@ -106,6 +111,10 @@ module Decidim
           .published
           .all
       end
+
+      def linked_assemblies
+        @linked_assemblies ||= current_participatory_space.linked_participatory_space_resources(:assembly, "included_participatory_processes").public_spaces
+      end
     end
   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/events/decidim/participatory_process_role_assigned_event.rb

@@ -0,0 +1,28 @@
+# frozen-string_literal: true
+
+module Decidim
+  class ParticipatoryProcessRoleAssignedEvent < Decidim::Events::SimpleEvent
+    include Decidim::Events::NotificationEvent
+    include Decidim::Events::AuthorEvent
+
+    def notification_title
+      I18n.t("notification_title", i18n_options).html_safe
+    end
+
+    def i18n_role
+      I18n.t(extra["role"], "decidim.admin.models.participatory_process_user_role.roles", default: extra["role"])
+    end
+
+    def i18n_options
+      {
+        resource_path: resource_path,
+        resource_title: resource_title,
+        resource_url: resource_url,
+        scope: event_name,
+        participatory_space_title: participatory_space_title,
+        participatory_space_url: participatory_space_url,
+        role: i18n_role
+      }
+    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