decidim-consultations 0.24.3 → 0.25.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a57b79f44ef8431a92ee879f88670e10a9f0bc7f7e05f6d514449cc41d705a
-  data.tar.gz: 8a7deefb364d59297a16a98b3406a0be10c5b193ef870e463f104f749a71dff2
+  metadata.gz: 5aa524deefdaef9be5dc1c2f64beadc017ad0ef763b0567437b82e93f38573cd
+  data.tar.gz: 302a087db8e132962bb79cd124977b75a91b64848794ff743590fe27dfe2fac0
 SHA512:
-  metadata.gz: 97a2d2e547dc329dda02b4e4f9974dd65f8974026a7446780891e0370666049ac328d6a58e10fb04d894592215e74a5851e4305bee83662e20c8a7161e12806f
-  data.tar.gz: ad410b74f846d50645a191a86c484996ffa3adb40fef93da1381e3fa7d39f8939fa3e5e45158d1b1e2176951b8767389cb47c994708e32237fc4f00a0fa15b06
+  metadata.gz: 6cbbd8a681bdfa90b2896138e8ceba1b9c5d8bee88daf63ef88e8473cd7eceb26c8da32f250143c321d0121bda16d6fba7d19bedc86b9fe2b56080064d9f159b
+  data.tar.gz: c38c6f123b0e88754238caf18c265549f2d153618aff871c5ab67e136dd4789cb0cfb87bdf418c4e86654953b9833c276ab05c596a87a5e95404189631c00ef1

data/app/cells/decidim/consultations/consultation_m_cell.rb

@@ -44,7 +44,7 @@ module Decidim
       end
 
       def resource_image_path
-        model.banner_image.url
+        model.attached_uploader(:banner_image).path
       end
 
       def has_image?

data/app/cells/decidim/consultations/content_blocks/highlighted_consultations/show.erb

@@ -7,7 +7,7 @@
         <% highlighted_consultations.each do |consultation| %>
           <div class="column">
             <%= link_to decidim_consultations.consultation_path(consultation), class: "card card--consultation card--mini" do %>
-              <div class="card__image-top" style="background-image:url(<%= consultation.banner_image.url %>)"></div>
+              <div class="card__image-top" style="background-image:url(<%= consultation.attached_uploader(:banner_image).path %>)"></div>
               <div class="card__content">
                 <span class="card__title card__link"><%= translated_attribute consultation.title %></span>
                 <span class="card--process__small"><%= voting_ends_text_for(consultation) %></span>

data/app/commands/decidim/consultations/admin/update_consultation.rb

@@ -6,14 +6,13 @@ module Decidim
       # A command with all the business logic when updating an existing participatory
       # consultation in the system.
       class UpdateConsultation < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # consultation - the Consultation to update
         # form - A form object with the params.
         def initialize(consultation, form)
-          form.banner_image = consultation.banner_image if form.banner_image.blank?
-          form.introductory_image = consultation.introductory_image if form.introductory_image.blank?
-
           @consultation = consultation
           @form = form
         end
@@ -57,16 +56,9 @@ module Decidim
             introductory_video_url: form.introductory_video_url,
             start_voting_date: form.start_voting_date,
             end_voting_date: form.end_voting_date
-          }.merge(uploader_attributes)
-        end
-
-        def uploader_attributes
-          {
-            banner_image: form.banner_image,
-            remove_banner_image: form.remove_banner_image,
-            introductory_image: form.introductory_image,
-            remove_introductory_image: form.remove_introductory_image
-          }.delete_if { |_k, val| val.is_a?(Decidim::ApplicationUploader) }
+          }.merge(
+            attachment_attributes(:introductory_image, :banner_image)
+          )
         end
       end
     end

data/app/commands/decidim/consultations/admin/update_question.rb

@@ -6,14 +6,13 @@ module Decidim
       # A command with all the business logic when updating an existing participatory
       # question in the system.
       class UpdateQuestion < Rectify::Command
+        include ::Decidim::AttachmentAttributesMethods
+
         # Public: Initializes the command.
         #
         # question - the Question to update
         # form - A form object with the params.
         def initialize(question, form)
-          form.hero_image = question.hero_image if form.hero_image.blank?
-          form.banner_image = question.banner_image if form.banner_image.blank?
-
           @question = question
           @form = form
         end
@@ -64,16 +63,9 @@ module Decidim
             external_voting: form.external_voting,
             i_frame_url: form.i_frame_url,
             order: form.order
-          }.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) }
+          }.merge(
+            attachment_attributes(:hero_image, :banner_image)
+          )
         end
       end
     end

data/app/controllers/concerns/decidim/consultations/needs_question.rb

@@ -112,7 +112,7 @@ module Decidim
         end
 
         def current_published_question_index
-          current_consultation_published_questions.find_index(current_question)
+          current_consultation_published_questions.find_index(current_question) || -1
         end
       end
     end

data/app/forms/decidim/consultations/admin/consultation_form.rb

@@ -15,10 +15,10 @@ module Decidim
         translatable_attribute :description, String
         attribute :slug, String
         attribute :banner_image
-        attribute :remove_banner_image
+        attribute :remove_banner_image, Boolean, default: false
         attribute :introductory_video_url, String
         attribute :introductory_image, String
-        attribute :remove_introductory_image
+        attribute :remove_introductory_image, Boolean, default: false
         attribute :decidim_highlighted_scope_id, Integer
         attribute :start_voting_date, Decidim::Attributes::LocalizedDate
         attribute :end_voting_date, Decidim::Attributes::LocalizedDate

data/app/forms/decidim/consultations/admin/question_form.rb

@@ -20,10 +20,10 @@ module Decidim
         translatable_attribute :origin_title, String
         attribute :origin_url, String
         attribute :slug, String
-        attribute :remove_hero_image
+        attribute :remove_hero_image, Boolean, default: false
         attribute :hero_image
         attribute :banner_image
-        attribute :remove_banner_image
+        attribute :remove_banner_image, Boolean, default: false
         attribute :hashtag, String
         attribute :decidim_scope_id, Integer
         attribute :external_voting, Boolean, default: false
@@ -37,7 +37,7 @@ module Decidim
         validates :banner_image, passthru: { to: Decidim::Consultations::Question }
         validate :slug_uniqueness
         validates :origin_scope, :origin_title, translatable_presence: true, if: :has_origin_data?
-        validates :i_frame_url, presence: true, if: :external_voting
+        validates :i_frame_url, url: true, presence: true, if: :external_voting
         validates :order, numericality: { only_integer: true, allow_nil: true, allow_blank: true }
 
         alias organization current_organization

data/app/models/decidim/consultation.rb

@@ -36,11 +36,11 @@ module Decidim
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Consultation.slug_format }
 
-    validates_upload :banner_image
-    mount_uploader :banner_image, Decidim::BannerImageUploader
+    has_one_attached :banner_image
+    validates_upload :banner_image, uploader: Decidim::BannerImageUploader
 
-    validates_upload :introductory_image
-    mount_uploader :introductory_image, Decidim::BannerImageUploader
+    has_one_attached :introductory_image
+    validates_upload :introductory_image, uploader: Decidim::BannerImageUploader
 
     scope :upcoming, -> { published.where("start_voting_date > ?", Time.now.utc) }
     scope :active, lambda {

data/app/models/decidim/consultations/question.rb

@@ -55,11 +55,11 @@ module Decidim
                dependent: :destroy,
                as: :participatory_space
 
-      validates_upload :hero_image
-      mount_uploader :hero_image, Decidim::HeroImageUploader
+      has_one_attached :hero_image
+      validates_upload :hero_image, uploader: Decidim::HeroImageUploader
 
-      validates_upload :banner_image
-      mount_uploader :banner_image, Decidim::BannerImageUploader
+      has_one_attached :banner_image
+      validates_upload :banner_image, uploader: Decidim::BannerImageUploader
 
       default_scope { order(order: :asc) }
 
@@ -132,7 +132,7 @@ module Decidim
       end
 
       def banner_image_url
-        banner_image.present? ? banner_image.url : consultation.banner_image.url
+        banner_image.attached? ? attached_uploader(:banner_image).path : consultation.attached_uploader(:banner_image).path
       end
 
       # Public: Check if the user has voted the question.
@@ -201,6 +201,14 @@ module Decidim
         true
       end
 
+      def user_allowed_to_comment?(user)
+        ActionAuthorizer.new(user, "comment", self, nil).authorize.ok?
+      end
+
+      def component
+        nil
+      end
+
       def attachment_context
         :admin
       end

data/app/packs/entrypoints/decidim_consultations.js

@@ -0,0 +1,8 @@
+import "src/decidim/consultations/show_more"
+import "src/decidim/consultations/utils"
+import "src/decidim/consultations/utils_multiple"
+import "src/decidim/consultations/vote_dialog"
+import "src/decidim/slug_form"
+
+// Images
+require.context("../images", true)

data/app/packs/src/decidim/consultations/show_more.js

@@ -0,0 +1,10 @@
+/* eslint-disable no-invalid-this */
+
+$(() => {
+
+  $(".show-more").on("click", function() {
+    $(this).hide();
+    $(".show-more-panel").removeClass("hide");
+  });
+
+})

data/app/{assets/javascripts/decidim/consultations/utils.js.es6 → packs/src/decidim/consultations/utils.js}

@@ -1,10 +1,10 @@
-/* eslint-disable no-invalid-this, no-undefined */
+/* eslint-disable no-invalid-this */
 
-(() => {
+$(() => {
   $(".vote-button-caption").mouseover(function () {
     const replaceText = $(this).data("replace");
 
-    if (replaceText !== null && replaceText !== undefined && replaceText !== "") {
+    if (replaceText) {
       $(this).text(replaceText);
     }
   });
@@ -12,8 +12,8 @@
   $(".vote-button-caption").mouseout(function () {
     const originalText = $(this).data("original");
 
-    if (originalText !== null && originalText !== undefined && originalText !== "") {
+    if (originalText) {
       $(this).text(originalText);
     }
   });
-})(this);
+})

data/app/{assets/javascripts → packs/src}/decidim/consultations/utils_multiple.js

@@ -1,7 +1,8 @@
 /* eslint-disable no-invalid-this, no-undefined */
 
-$(document).ready(function () {
+$(() => {
   let $remainingVotesCount = $("#remaining-votes-count");
+
   $('form .multiple_votes_form input[type="checkbox"]').on("change", function(event) {
     let max = parseInt($remainingVotesCount.text(), 10);
     if ($(this).is(":checked")) {

data/app/{assets/javascripts → packs/src}/decidim/consultations/vote_dialog.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-invalid-this */
 
-$(document).ready(function () {
+$(() => {
   let button = $("#vote_button"),
       buttonChange = $("#question-vote-confirm-modal-button-change"),
       responseButtons = $(".response-title"),

data/app/packs/stylesheets/decidim/consultations/consultations.scss

@@ -0,0 +1,14 @@
+@import "stylesheets/decidim/consultations/question";
+@import "stylesheets/decidim/consultations/question_multiple_votes";
+@import "stylesheets/decidim/consultations/video_wrapper";
+@import "stylesheets/decidim/consultations/stats";
+@import "stylesheets/decidim/consultations/consultations/consultations-banner";
+@import "stylesheets/decidim/consultations/consultations/consultations-card";
+@import "stylesheets/decidim/consultations/consultations/consultations-header";
+@import "stylesheets/decidim/consultations/consultations/consultations-home-banner";
+@import "stylesheets/decidim/consultations/consultations/consultations-home-intro";
+@import "stylesheets/decidim/consultations/consultations/consultations-intro";
+@import "stylesheets/decidim/consultations/consultations/consultations_nav";
+@import "stylesheets/decidim/consultations/consultations/consultations-title";
+@import "stylesheets/decidim/consultations/consultations/introductory_image";
+@import "stylesheets/decidim/consultations/banners/block-banner";

data/app/queries/decidim/consultations/admin/admin_users.rb

@@ -3,37 +3,41 @@
 module Decidim
   module Consultations
     module Admin
-      # A class used to find the admins for a participatory process including
-      # organization admins.
+      # A class used to find the admins for a consultation or an organization consultations.
       class AdminUsers < Rectify::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
-        # consultation - a process that needs to find its process admins
+        # consultation - a consultation that needs to find its consultation admins
         def self.for(consultation)
           new(consultation).query
         end
 
+        # Syntactic sugar to initialize the class and return the queried objects.
+        #
+        # organization - an organization that needs to find its consultation admins
+        def self.for_organization(organization)
+          new(nil, organization).query
+        end
+
         # Initializes the class.
         #
-        # consultation - a consultation that needs to find its process admins
-        def initialize(consultation)
+        # consultation - a consultation that needs to find its consultation admins
+        # organization - an organization that needs to find its consultation admins
+        def initialize(consultation, organization = nil)
           @consultation = consultation
+          @organization = consultation&.organization || organization
         end
 
-        # Finds organization admins and the users with role admin for the given process.
+        # Finds organization admins and the users with role admin for the given consultation.
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins)
+          organization.admins
         end
 
         private
 
-        attr_reader :consultation
-
-        def organization_admins
-          consultation.organization.admins
-        end
+        attr_reader :organization
       end
     end
   end

data/app/views/decidim/consultations/_consultation.html.erb

@@ -1,7 +1,7 @@
 <%= link_to consultation_path(consultation), class: "consultations-banner" do %>
   <div class="consultations-header consultations-home-banner row column">
     <div class="row column consultations-header__main"
-         style="background-image:url(<%= consultation.banner_image.url %>);">
+         style="background-image:url(<%= consultation.attached_uploader(:banner_image).path %>);">
       <div class="consultations-header__container row">
         <div class="columns mediumlarge-9 consultations-header__info">
           <div>

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

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "decidim/slug_form" %>
+<%= javascript_pack_tag "decidim_consultations" %>
 
 <div class="card">
   <div class="card-divider">

data/app/views/decidim/consultations/admin/question_configuration/_form.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "decidim/slug_form" %>
+<%= javascript_pack_tag "decidim_consultations" %>
 
 <div class="card">
   <div class="card-divider">

data/app/views/decidim/consultations/admin/questions/_form.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "decidim/slug_form" %>
+<%= javascript_pack_tag "decidim_consultations" %>
 
 <div class="card">
   <div class="card-divider">

data/app/views/decidim/consultations/consultations/_consultation_card.html.erb

@@ -2,7 +2,7 @@
   <div class="card card--process">
     <%= link_to consultation_path(consultation), class: "card__link" do %>
       <div class="card__image-top"
-           style="background-image:url(<%= consultation.banner_image.url %>)"></div>
+           style="background-image:url(<%= consultation.attached_uploader(:banner_image).path %>)"></div>
     <% end %>
     <div class="card__content">
       <%= link_to consultation_path(consultation), class: "card__link" do %>

data/app/views/decidim/consultations/consultations/_consultation_details.html.erb

@@ -5,7 +5,7 @@
   <div class="columns medium-6 large-5 large-pull-1">
     <% if consultation.introductory_video_url.blank? %>
       <div class="card--full__image consultations-card__image introductory-image"
-           style="background-image: url(<%= consultation.introductory_image_url %>);">
+           style="background-image: url(<%= consultation.attached_uploader(:introductory_image).path %>);">
       </div>
     <% else %>
       <div class="embed-container">

data/app/views/decidim/consultations/consultations/_filters.html.erb

@@ -9,6 +9,7 @@
                               class: "input-group-field",
                               placeholder: t("consultations.filters.search", scope: "decidim"),
                               title: t("consultations.filters.search", scope: "decidim"),
+                              "aria-label": t("consultations.filters.search", scope: "decidim"),
                               data: { disable_dynamic_change: true } %>
         <div class="input-group-button">
           <button type="submit" class="button" aria-controls="consultations">

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

@@ -31,5 +31,4 @@ edit_link(
   </div>
 <% end %>
 
-<%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/results_listing" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/decidim/consultations/question_multiple_votes/_voting_rules.html.erb

@@ -26,4 +26,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/consultations/utils_multiple" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/decidim/consultations/questions/_right_column.html.erb

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_space.hero_image_url,
+  image_url: current_participatory_space.attached_uploader(:hero_image).path,
   description: translated_attribute(current_participatory_space.question_context),
   title: strip_tags(translated_attribute(current_participatory_space.title)),
   url: decidim_consultations.question_url(current_participatory_space),

data/app/views/decidim/consultations/questions/_vote_button.html.erb

@@ -96,5 +96,4 @@
 
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>
-<%= javascript_include_tag "decidim/consultations/utils" %>
-<%= javascript_include_tag "decidim/consultations/vote_dialog" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/app/views/decidim/consultations/questions/show.html.erb

@@ -30,13 +30,12 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/consultations/show_more" %>
 <%= comments_for current_question if current_question.published? %>
 
 <%= content_for :question_header_details do %>
   <div id="question-header-details" class="row consultations-home-intro">
     <div class="columns medium-5">
-      <%= image_tag current_question.hero_image&.url, alt: t("question.hero_image", scope: "activemodel.attributes") if current_question.hero_image&.url %>
+      <%= image_tag current_question.attached_uploader(:hero_image).path, alt: t("question.hero_image", scope: "activemodel.attributes") if current_question.hero_image.attached? %>
     </div>
 
     <div class="columns medium-5">
@@ -56,3 +55,5 @@
     </div>
   </div>
 <% end %>
+
+<%= javascript_pack_tag "decidim_consultations" %>

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

@@ -2,7 +2,7 @@
 
 <div class="consultations-header consultations-home-banner row column">
   <div class="row column consultations-header__main"
-       style="background-image:url(<%= current_consultation.banner_image.url %>);">
+       style="background-image:url(<%= current_consultation.attached_uploader(:banner_image).path %>);">
     <div class="consultations-header__container row">
       <div class="columns mediumlarge-9 consultations-header__info">
         <div>

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

@@ -7,7 +7,7 @@
           <%= component_icon(current_component) %>
           <%= translated_attribute(current_component.name) %>
         <% else %>
-          <%= external_icon "decidim/pages/icon.svg", role: "img", "aria-hidden": true %>
+          <%= external_icon "media/images/decidim_pages.svg", role: "img", "aria-hidden": true %>
           <%= t ".question_menu_item" %>
         <% end %>
       </span>

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

@@ -1,6 +1,6 @@
 <div class="consultations-header row column">
   <div class="row column consultations-header__main"
-       style="background-image:url(<%= question.banner_image_url %>);">
+       style="background-image:url(<%= question.attached_uploader(:banner_image).path %>);">
     <div class="consultations-header__container row">
       <div class="columns mediumlarge-9 consultations-header__info">
         <div>

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

@@ -1,5 +1,5 @@
 <% content_for :sidebar_menu_nav do %>
-  <%= admin_consultation_menu.render do
+  <%= sidebar_menu(:admin_consultation_menu).render do
     public_page_link decidim_consultations.consultation_path(current_consultation)
   end %>
 <% end %>