decidim-participatory_processes 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ab48f7bee8d5ef841aaa5ca5636623dea2e1d3
-  data.tar.gz: 002c3fe44756d5178e346cbd82815767eaaf5abc
+  metadata.gz: 02b9c17611f48b363023d86b9649d135fdc4b314
+  data.tar.gz: 92217fba53f0febda74b31ba5510379c07c2441c
 SHA512:
-  metadata.gz: 8673b9de25032d4fd31490f1d8c40c7468213e64ef4246da4513d2ceca61be988dad0c12e92084eaa87654f79e04703c0653deb16623dd7f55ce94e4d98347ef
-  data.tar.gz: e5c439c075754fb8bae6e8fc887967d1425e97fc56b604300b22c9e00ee79896707503078d3bdd2623e502053794c3086713d54a6f7d5c5eaf9141135b9d4528
+  metadata.gz: 88173b1eb06fcfbcb9daf6ff7d1fa585966f76931a0054f90a2645758299af37686deec205b4e1162885b5efe2c2fd523f5458587391829a097d7441a3bd44cb
+  data.tar.gz: 00ae74a8697aa2d7e64aff5cd8e0e58f2bf5383c77cde80fcef91e3cc4b5d34c981fc3b270aa26b2644412190cf34aaff4946da280f414375ab759d24ff7276a

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

@@ -34,11 +34,13 @@ module Decidim
         attr_reader :step
 
         def deactivate_active_steps
-          step.participatory_process.steps.where(active: true).update_all(active: false)
+          step.participatory_process.steps.where(active: true).each do |step|
+            step.update_attributes!(active: false)
+          end
         end
 
         def activate_step
-          step.update_attribute(:active, true)
+          step.update_attributes!(active: true)
         end
       end
     end

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

@@ -30,7 +30,9 @@ module Decidim
         attr_reader :step
 
         def deactivate_active_steps
-          step.participatory_process.steps.where(active: true).update_all(active: false)
+          step.participatory_process.steps.where(active: true).each do |step|
+            step.update_attributes!(active: false)
+          end
         end
       end
     end

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

@@ -21,7 +21,7 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) unless order.present?
+          return broadcast(:invalid) if order.blank?
 
           reorder_steps
           broadcast(:ok)
@@ -36,11 +36,14 @@ module Decidim
             hash.update(id => { position: index })
           end
 
+          # rubocop:disable Rails/SkipsModelValidations
           ParticipatoryProcessStep.transaction do
             collection.update_all(position: nil)
             collection.reload
             collection.update(data.keys, data.values)
+            collection.each(&:save!)
           end
+          # rubocop:enable Rails/SkipsModelValidations
         end
 
         def order

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

@@ -46,6 +46,7 @@ module Decidim
           {
             name: form.name,
             hero_image: form.hero_image,
+            remove_hero_image: form.remove_hero_image,
             description: form.description,
             participatory_processes: participatory_processes
           }

data/app/constraints/decidim/participatory_processes/current_participatory_process.rb

@@ -30,7 +30,13 @@ module Decidim
       end
 
       def detect_current_participatory_process(params)
-        OrganizationParticipatoryProcesses.new(@organization).query.find_by_id(params["participatory_process_id"])
+        organization_processes.where(slug: params["participatory_process_slug"]).or(
+          organization_processes.where(id: params["participatory_process_id"])
+        ).first!
+      end
+
+      def organization_processes
+        @organization_processes ||= OrganizationParticipatoryProcesses.new(@organization).query
       end
     end
   end

data/app/controllers/concerns/decidim/participatory_processes/needs_participatory_process.rb

@@ -42,7 +42,11 @@ module Decidim
 
         def detect_participatory_process
           request.env["current_participatory_process"] ||
-            OrganizationParticipatoryProcesses.new(current_organization).query.find(params[:participatory_process_id] || params[:id])
+            organization_processes.find_by!(slug: params[:participatory_process_slug] || params[:slug])
+        end
+
+        def organization_processes
+          @organization_processes ||= OrganizationParticipatoryProcesses.new(current_organization).query
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachments
 
         def after_destroy_path
-          participatory_process_attachments_path(current_participatory_process.id)
+          participatory_process_attachments_path(current_participatory_process)
         end
 
         def attached_to

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

@@ -47,7 +47,10 @@ module Decidim
 
         def update
           authorize! :update, current_participatory_process
-          @form = form(ParticipatoryProcessForm).from_params(participatory_process_params)
+          @form = form(ParticipatoryProcessForm).from_params(
+            participatory_process_params,
+            process_id: current_participatory_process.id
+          )
 
           UpdateParticipatoryProcess.call(current_participatory_process, @form) do
             on(:ok) do |participatory_process|
@@ -78,7 +81,9 @@ module Decidim
         private
 
         def current_participatory_process
-          @current_participatory_process ||= collection.find(params[:id]) if params[:id]
+          @current_participatory_process ||= collection.where(slug: params[:slug]).or(
+            collection.where(id: params[:slug])
+          ).first
         end
 
         def collection

data/app/controllers/decidim/participatory_processes/participatory_process_widgets_controller.rb

@@ -6,7 +6,7 @@ module Decidim
       private
 
       def model
-        @model ||= ParticipatoryProcess.find(params[:participatory_process_id])
+        @model ||= ParticipatoryProcess.where(slug: params[:participatory_process_slug]).first
       end
 
       def current_participatory_space

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -18,6 +18,8 @@ module Decidim
       helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats, :filter
 
       def index
+        redirect_to "/404" if published_processes.none?
+
         authorize! :read, ParticipatoryProcess
         authorize! :read, ParticipatoryProcessGroup
       end
@@ -28,6 +30,10 @@ module Decidim
 
       private
 
+      def published_processes
+        @published_processes ||= OrganizationPublishedParticipatoryProcesses.new(current_organization)
+      end
+
       def collection
         @collection ||= (participatory_processes.to_a + participatory_process_groups).flatten
       end

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

@@ -18,9 +18,9 @@ module Decidim
         attribute :copy_categories, Boolean
         attribute :copy_features, Boolean
 
-        validates :slug, presence: true
+        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, translatable_presence: true
-        validate :slug, :slug_uniqueness
+        validate :slug_uniqueness
 
         private
 

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

@@ -37,11 +37,11 @@ module Decidim
         attribute :participatory_process_group_id, Integer
         attribute :show_statistics, Boolean
 
-        validates :slug, presence: true
+        validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
         validates :title, :subtitle, :description, :short_description, translatable_presence: true
         validates :scope, presence: true, if: proc { |object| object.scope_id.present? }
 
-        validate :slug, :slug_uniqueness
+        validate :slug_uniqueness
 
         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, file_size: { less_than_or_equal_to: ->(_record) { Decidim.maximum_attachment_size } }, file_content_type: { allow: ["image/jpeg", "image/png"] }
@@ -62,7 +62,7 @@ module Decidim
         private
 
         def slug_uniqueness
-          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: id).any?
+          return unless OrganizationParticipatoryProcesses.new(current_organization).query.where(slug: slug).where.not(id: context[:process_id]).any?
 
           errors.add(:slug, :taken)
         end

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

@@ -16,6 +16,7 @@ module Decidim
         mimic :participatory_process_group
 
         attribute :hero_image
+        attribute :remove_hero_image
 
         validates :name, :description, translatable_presence: true
 

data/app/models/decidim/participatory_process.rb

@@ -42,8 +42,8 @@ module Decidim
 
     attr_readonly :active_step
 
-    validates :slug, presence: true
     validates :slug, uniqueness: { scope: :organization }
+    validates :slug, presence: true, format: { with: Decidim::ParticipatoryProcess.slug_format }
 
     mount_uploader :hero_image, Decidim::HeroImageUploader
     mount_uploader :banner_image, Decidim::BannerImageUploader
@@ -58,5 +58,9 @@ module Decidim
     def hashtag
       attributes["hashtag"].to_s.delete("#")
     end
+
+    def to_param
+      slug
+    end
   end
 end

data/app/views/decidim/participatory_process_groups/_participatory_process_group.html.erb

@@ -8,7 +8,7 @@
       <%= link_to participatory_process_group_path(participatory_process_group), class: "card__link" do %>
         <h4 class="card__title"><%= translated_attribute participatory_process_group.name %></h4>
       <% end %>
-      <p class="card__desc"><%== html_truncate(translated_attribute(participatory_process_group.description), length: 630, separator: '...') %></p>
+      <p class="card__desc"><%= sanitize html_truncate(translated_attribute(participatory_process_group.description), length: 630, separator: '...') %></p>
     </div>
     <div class="card__footer">
       <div class="card__support">

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

@@ -8,7 +8,7 @@
       <%= link_to participatory_process_path(participatory_process), class: "card__link" do %>
         <h4 class="card__title"><%= translated_attribute participatory_process.title %></h4>
       <% end %>
-      <p class="card__desc"><%== html_truncate(translated_attribute(participatory_process.short_description), length: 630, separator: '...') %></p>
+      <p class="card__desc"><%= sanitize html_truncate(translated_attribute(participatory_process.short_description), length: 630, separator: '...') %></p>
     </div>
     <div class="card__footer">
       <div class="card__support">

data/app/views/decidim/participatory_processes/admin/participatory_process_copies/_form.html.erb

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
 <div class="card" id="processes">
   <div class="card-divider">
     <h2 class="card-title"><%= title %></h2>
@@ -9,8 +11,9 @@
         <div class="column xlarge-8">
           <%= form.translated :text_field, :title, autofocus: true %>
         </div>
-        <div class="column xlarge-4">
+        <div class="column xlarge-4 slug">
           <%= form.text_field :slug %>
+          <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:processes, form.object.slug)) %></p>
         </div>
       </div>
       <div class="card">

data/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "decidim/slug_form" %>
+
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= t "participatory_processes.form.title", scope: "decidim.admin" %></h2>
@@ -13,8 +15,9 @@
     </div>
 
     <div class="row">
-      <div class="columns xlarge-6">
+      <div class="columns xlarge-6 slug">
         <%= form.text_field :slug %>
+        <p class="help-text"><%== t(".slug_help", url: decidim_form_slug_url(:processes, form.object.slug)) %></p>
       </div>
 
       <div class="columns xlarge-6">

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

@@ -5,7 +5,7 @@
     <h1 class="section-heading"><%= t("participatory_process_groups.show.group_participatory_processes", scope: "decidim", group: translated_attribute(group.name)) %></h1>
     <%= render partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: false } %>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-      <%= render participatory_processes || render(partial: "no_processes_yet") %>
+      <%= render participatory_processes %>
     </div>
   </section>
 </main>

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

@@ -1,6 +1,6 @@
 <% content_for(:header, "false") %>
 <% content_for(:title, translated_attribute(model.title)) %>
-<p class="card__desc"><%== html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
+<p class="card__desc"><%= sanitize html_truncate(translated_attribute(model.short_description), length: 630, separator: '...') %></p>
 <% content_for(:footer) do %>
   <div class="card__support">
     <% if model.active_step %>

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

@@ -5,7 +5,7 @@
         <%= link_to participatory_process_path(promoted_process), class: "card__link" do %>
           <h2 class="card__title"><%= translated_attribute promoted_process.title %></h2>
         <% end %>
-        <%== html_truncate(translated_attribute(promoted_process.short_description), length: 630, separator: '...') %>
+        <%= 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 %>
           <%= t("participatory_processes.promoted_process.more_info", scope: "layouts.decidim") %>
         <% end %>

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

@@ -14,7 +14,7 @@
     </div>
     <p class="loading"><%= t('.loading') %></p>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-      <%= render(collection) || render(partial: "no_processes_yet") %>
+      <%= render(collection) %>
     </div>
   </section>
 </main>

data/app/views/decidim/participatory_processes/participatory_processes/index.js.erb

@@ -1,6 +1,6 @@
 const $grid = $('#processes-grid');
 const $loading = $grid.find('.loading');
 
-$grid.find('.card-grid').html('<%= j(render(collection) || render(partial: "no_processes_yet")).strip.html_safe %>');
+$grid.find('.card-grid').html('<%= j(render(collection)).strip.html_safe %>');
 $grid.find('.processes-grid-order-by').html('<%= j(render(partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
 $loading.hide();

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

@@ -15,9 +15,9 @@
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
         <div class="lead">
-          <%== translated_attribute(current_participatory_process.short_description) %>
+          <%= sanitize translated_attribute(current_participatory_process.short_description) %>
         </div>
-        <%== translated_attribute(current_participatory_process.description) %>
+        <%= sanitize translated_attribute(current_participatory_process.description) %>
       </div>
       <%= attachments_for current_participatory_process %>
     </div>
@@ -26,7 +26,7 @@
         <% if translated_attribute(current_participatory_process.meta_scope).present? %>
           <div class="definition-data__item scope">
             <span class="definition-data__title"><%= t("participatory_processes.show.scope", scope: "decidim") %></span>
-              <%== translated_attribute(current_participatory_process.meta_scope) %>
+              <%= translated_attribute(current_participatory_process.meta_scope) %>
           </div>
         <% end %>
 
@@ -47,35 +47,35 @@
         <% if translated_attribute(current_participatory_process.developer_group).present? %>
           <div class="definition-data__item developer-group">
             <span class="definition-data__title"><%= t("participatory_processes.show.developer_group", scope: "decidim") %></span>
-              <%== translated_attribute(current_participatory_process.developer_group) %>
+              <%= translated_attribute(current_participatory_process.developer_group) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_participatory_process.local_area).present? %>
           <div class="definition-data__item local_area">
             <span class="definition-data__title"><%= t("participatory_processes.show.local_area", scope: "decidim") %></span>
-              <%== translated_attribute(current_participatory_process.local_area) %>
+              <%= translated_attribute(current_participatory_process.local_area) %>
           </div>
         <% end %>
 
          <% if translated_attribute(current_participatory_process.target).present? %>
           <div class="definition-data__item target">
             <span class="definition-data__title"><%= t("participatory_processes.show.target", scope: "decidim") %></span>
-              <%== translated_attribute(current_participatory_process.target) %>
+              <%= translated_attribute(current_participatory_process.target) %>
           </div>
         <% end %>
 
          <% if translated_attribute(current_participatory_process.participatory_scope).present? %>
           <div class="definition-data__item participatory_scope">
             <span class="definition-data__title"><%= t("participatory_processes.show.participatory_scope", scope: "decidim") %></span>
-              <%== translated_attribute(current_participatory_process.participatory_scope) %>
+              <%= translated_attribute(current_participatory_process.participatory_scope) %>
           </div>
         <% end %>
 
         <% if translated_attribute(current_participatory_process.participatory_structure).present? %>
           <div class="definition-data__item participatory_structure">
             <span class="definition-data__title"><%= t("participatory_processes.show.participatory_structure", scope: "decidim") %></span>
-              <%== translated_attribute(current_participatory_process.participatory_structure) %>
+              <%= translated_attribute(current_participatory_process.participatory_structure) %>
           </div>
         <% end %>
       </div>

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

@@ -40,7 +40,7 @@
         <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
           <ul>
             <li class="<%= "is-active" if is_active_link?(decidim_participatory_processes.participatory_process_path(current_participatory_process), :exclusive) %>">
-              <%= active_link_to decidim_participatory_processes.participatory_process_path(current_participatory_process), active: :exact, class: "process-nav__link", class_active: "is-active" do %>
+              <%= active_link_to decidim_participatory_processes.participatory_process_path(current_participatory_process), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
                 <%= external_icon "decidim/participatory_processes/process.svg" %>
                 <%= t ".process_menu_item" %>
               <% end %>

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

@@ -36,8 +36,8 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Attachment %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_process.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_process.id) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("attachments", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.participatory_process_attachments_path(current_participatory_process) %>
         </li>
       <% end %>
       <% if can? :read, Decidim::ParticipatoryProcessUserRole %>
@@ -46,8 +46,8 @@
         </li>
       <% end %>
       <% if can? :read, Decidim::Moderation %>
-        <li <% if is_active_link?(decidim_admin_participatory_processes.moderations_path(current_participatory_process.id)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_process.id) %>
+        <li <% if is_active_link?(decidim_admin_participatory_processes.moderations_path(current_participatory_process)) %> class="is-active" <% end %>>
+          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_participatory_processes.moderations_path(current_participatory_process) %>
         </li>
       <% end %>
     </ul>

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

@@ -19,12 +19,8 @@
       </div>
     </div>
   <% end %>
-<% end %>
 
-<% if try(:current_feature) %>
-  <% current_feature.manifest.actions.each do |action| %>
-    <%= action_authorization_modal(action) %>
-  <% end %>
+  <%= render "layouts/decidim/feature_authorization_modals" %>
 <% end %>
 
 <% provide :meta_image_url, current_participatory_process.banner_image.url %>