decidim-consultations 0.26.5 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d73c6a82981690ec677074cb1dbc436240333e6a6b42c5d04a5d35e7695dcc
-  data.tar.gz: 5581547c31a6bee5b8ac45396df12c1f4a89e3c95c58896db4f75f19a996e3e6
+  metadata.gz: ed2b64c4b2a1e4fe0318cc12cfab14df6d0d890bd1a92cfd67dd00fdb6333d18
+  data.tar.gz: 9d68171ea724aa3f93c18a9e9f2d4b88da2bc8f3dd244cdc2d223fc69f7929d3
 SHA512:
-  metadata.gz: 59160a8b6d6a755542088492c26b0568ff3aa93b7b5c6eeafa2c305a4d44cc906e1d805ca7917f4777793436c7697ed6e5f7df8c4808cd3ff5ef210799299183
-  data.tar.gz: 83da9e61428beb8b3d532f3b12d1ff5952800688a69ae651120c84dab4349d9af44ca233d95b146502950a2137b73441d6acc026ed6bc5d06f167a1988ea701d
+  metadata.gz: 387ce250a35f9dcc9d9023097e98299c39eb0ad03244c3a34aee94b78b38df109f6e08f892321f80a151a94550377932d3c6f618e51b9429e843bab4d12c8f60
+  data.tar.gz: 5ec9a304e767896b408bcc7df7f59de3c33804bcc7b8002d9c2beac84f346b3e18c1bead3cbd45441e14878f619622de5768ef6bbd1afee25cd37771a93c366a

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

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_consultations" class="wrapper-home home-section">
   <div class="row" id="highlighted-consultations">
     <h3 class="section-heading"><%= t("active_consultations", scope: i18n_scope) %></h3>
     <div class="row collapse">
@@ -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.attached_uploader(:banner_image).path %>')"></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/create_consultation.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when creating a new participatory
       # consultation in the system.
-      class CreateConsultation < Rectify::Command
+      class CreateConsultation < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when creating a new question
-      class CreateQuestion < Rectify::Command
+      class CreateQuestion < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when creating a new response
-      class CreateResponse < Rectify::Command
+      class CreateResponse < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when creating a new response group
-      class CreateResponseGroup < Rectify::Command
+      class CreateResponseGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic to destroy a response group in the
       # system.
-      class DestroyResponseGroup < Rectify::Command
+      class DestroyResponseGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # response_group - A ResponseGroup that will be destroyed

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation as published.
-      class PublishConsultation < Rectify::Command
+      class PublishConsultation < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will be published

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation results as published.
-      class PublishConsultationResults < Rectify::Command
+      class PublishConsultationResults < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will get its results published

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a question as published.
-      class PublishQuestion < Rectify::Command
+      class PublishQuestion < Decidim::Command
         # Public: Initializes the command.
         #
         # question - A Question that will be published

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation as unpublished.
-      class UnpublishConsultation < Rectify::Command
+      class UnpublishConsultation < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will be unpublished

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a consultation results as unpublished.
-      class UnpublishConsultationResults < Rectify::Command
+      class UnpublishConsultationResults < Decidim::Command
         # Public: Initializes the command.
         #
         # consultation - A Consultation that will get its results unpublished

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that sets a question as unpublished.
-      class UnpublishQuestion < Rectify::Command
+      class UnpublishQuestion < Decidim::Command
         # Public: Initializes the command.
         #
         # question - A Question that will be unpublished

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating an existing participatory
       # consultation in the system.
-      class UpdateConsultation < Rectify::Command
+      class UpdateConsultation < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when updating an existing participatory
       # question in the system.
-      class UpdateQuestion < Rectify::Command
+      class UpdateQuestion < Decidim::Command
         include ::Decidim::AttachmentAttributesMethods
 
         # Public: Initializes the command.

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command that configures how many and how much questions can be voted.
-      class UpdateQuestionConfiguration < Rectify::Command
+      class UpdateQuestionConfiguration < Decidim::Command
         # Public: Initializes the command.
         #
         # question - the Question to update

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when updating an response in the system.
-      class UpdateResponse < Rectify::Command
+      class UpdateResponse < Decidim::Command
         # Public: Initializes the command.
         #
         # response - the response to update

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A command with all the business logic when updating a new response group
-      class UpdateResponseGroup < Rectify::Command
+      class UpdateResponseGroup < Decidim::Command
         # Public: Initializes the command.
         #
         # response_group - the response group to update

data/app/commands/decidim/consultations/multiple_vote_question.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # A command with all the business logic when a user votes a multivote question.
-    class MultipleVoteQuestion < Rectify::Command
+    class MultipleVoteQuestion < Decidim::Command
       # Public: Initializes the command.
       #
       # form   - A Decidim::Consultations::MultiVoteForm object.

data/app/commands/decidim/consultations/unvote_question.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # A command with all the business logic when a user unvotes a question.
-    class UnvoteQuestion < Rectify::Command
+    class UnvoteQuestion < Decidim::Command
       # Public: Initializes the command.
       #
       # question   - A Decidim::Consultations::Question object.

data/app/commands/decidim/consultations/vote_question.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # A command with all the business logic when a user votes a question.
-    class VoteQuestion < Rectify::Command
+    class VoteQuestion < Decidim::Command
       # Public: Initializes the command.
       #
       # form   - A Decidim::Consultations::VoteForm object.

data/app/controllers/decidim/consultations/consultations_controller.rb

@@ -38,28 +38,21 @@ module Decidim
       end
 
       def consultations
-        @consultations = search.results
+        @consultations = search.result
         @consultations = reorder(@consultations)
         @consultations = paginate(@consultations)
       end
 
       alias collection consultations
 
-      def search_klass
-        ConsultationSearch
+      def search_collection
+        Consultation.where(organization: current_organization).published
       end
 
       def default_filter_params
         {
-          search_text: "",
-          state: "all"
-        }
-      end
-
-      def context_params
-        {
-          organization: current_organization,
-          current_user: current_user
+          search_text_cont: "",
+          with_any_date: "all"
         }
       end
     end

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

@@ -17,7 +17,7 @@ module Decidim
         attribute :banner_image
         attribute :remove_banner_image, Boolean, default: false
         attribute :introductory_video_url, String
-        attribute :introductory_image, String
+        attribute :introductory_image
         attribute :remove_introductory_image, Boolean, default: false
         attribute :decidim_highlighted_scope_id, Integer
         attribute :start_voting_date, Decidim::Attributes::LocalizedDate

data/app/helpers/decidim/consultations/consultations_helper.rb

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module ConsultationsHelper
       # Returns  options for state filter selector.
-      def options_for_state_filter
+      def options_for_date_filter
         [
           ["all", t("consultations.filters.all", scope: "decidim")],
           ["active", t("consultations.filters.active", scope: "decidim")],

data/app/helpers/decidim/consultations/questions_helper.rb

@@ -34,11 +34,11 @@ module Decidim
         tag = "button"
         html_options ||= {}
 
-        if !current_user
-          html_options["data-open"] = "loginModal"
-        else
+        if current_user
           html_options["data-open"] = "authorizationModal"
           html_options["data-open-url"] = decidim_consultations.authorization_vote_modal_question_path(question)
+        else
+          html_options["data-open"] = "loginModal"
         end
 
         html_options["onclick"] = "event.preventDefault();"

data/app/models/decidim/consultation.rb

@@ -14,6 +14,7 @@ module Decidim
     include Decidim::Searchable
     include Decidim::HasUploadValidations
     include Decidim::TranslatableResource
+    include Decidim::FilterableResource
 
     translatable_fields :title, :subtitle, :description
 
@@ -51,6 +52,8 @@ module Decidim
     scope :finished, -> { published.where("end_voting_date < ?", Time.now.utc) }
     scope :order_by_most_recent, -> { order(created_at: :desc) }
 
+    scope_search_multi :with_any_date, [:active, :upcoming, :finished]
+
     searchable_fields({
                         participatory_space: :itself,
                         A: :title,
@@ -106,9 +109,12 @@ module Decidim
       !active?
     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))
+    # Create i18n ransackers for :title, :subtitle and :description.
+    # Create the :search_text ransacker alias for searching from all of these.
+    ransacker_i18n_multi :search_text, [:title, :subtitle, :description]
+
+    def self.ransackable_scopes(_auth_object = nil)
+      [:with_any_date]
     end
   end
 end

data/app/permissions/decidim/consultations/permissions.rb

@@ -36,14 +36,12 @@ module Decidim
         return unless permission_action.scope == :public
 
         case permission_action.subject
-        when :consultation_list
+        when :consultation_list, :participatory_space
           allow!
         when :consultation
           toggle_allow(consultation.published? || user&.admin?)
         when :question
           toggle_allow(question.published? || user&.admin?)
-        when :participatory_space
-          allow!
         end
       end
 

data/app/presenters/decidim/consultations/question_stats_presenter.rb

@@ -3,8 +3,10 @@
 module Decidim
   module Consultations
     # A presenter to render statistics in the homepage.
-    class QuestionStatsPresenter < Rectify::Presenter
-      attribute :question, Decidim::Consultations::Question
+    class QuestionStatsPresenter < SimpleDelegator
+      def question
+        __getobj__.fetch(:question)
+      end
 
       def supports_count
         question.votes_count

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

@@ -4,7 +4,7 @@ module Decidim
   module Consultations
     module Admin
       # A class used to find the admins for a consultation or an organization consultations.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # consultation - a consultation that needs to find its consultation admins

data/app/queries/decidim/consultations/organization_active_consultations.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # This query class filters all consultations given an organization.
-    class OrganizationActiveConsultations < Rectify::Query
+    class OrganizationActiveConsultations < Decidim::Query
       def self.for(organization)
         new(organization).query
       end

data/app/queries/decidim/consultations/organization_consultations.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # This query class filters all consultations given an organization.
-    class OrganizationConsultations < Rectify::Query
+    class OrganizationConsultations < Decidim::Query
       def self.for(organization)
         new(organization).query
       end

data/app/queries/decidim/consultations/organization_questions.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     # This query class filters all questions given an organization.
-    class OrganizationQuestions < Rectify::Query
+    class OrganizationQuestions < Decidim::Query
       def self.for(organization)
         new(organization).query
       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.attached_uploader(:banner_image).path %>');">
+         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/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.attached_uploader(:banner_image).path %>')"></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.attached_uploader(:introductory_image).path %>');">
+           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

@@ -4,7 +4,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text,
+        <%= form.search_field :search_text_cont,
                               label: false,
                               class: "input-group-field",
                               placeholder: t("consultations.filters.search", scope: "decidim"),
@@ -20,11 +20,11 @@
     </div>
   </div>
 
-  <%= form.collection_radio_buttons :state,
-                                    options_for_state_filter,
+  <%= form.collection_radio_buttons :with_any_date,
+                                    options_for_date_filter,
                                     :first,
                                     :last,
-                                    { legend_title: t("consultations.filters.state", scope: "decidim") },
+                                    { legend_title: t("consultations.filters.date", scope: "decidim") },
                                     "aria-controls": "consultations" %>
 
   <%= hidden_field_tag :order, order, id: nil, class: "order_filter" %>

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

@@ -11,7 +11,7 @@
 
     <div class="columns mediumlarge-8 large-3 card--process__column">
       <div class="card--full__image consultations-card__image"
-           style="background-image: url('<%= question.banner_image_url %>')">
+           style="background-image: url(<%= question.banner_image_url %>)">
         <div class="card__content row collapse">
           <div class="columns large-10 large-push-1">
             <% if question.results_published? %>

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

@@ -31,4 +31,6 @@ edit_link(
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>

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

@@ -26,4 +26,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>

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

@@ -96,4 +96,6 @@
 
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>

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

@@ -17,6 +17,7 @@
   <div class="row">
     <div class="columns medium-8 medium-offset-2">
       <%= form_with url: decidim_consultations.question_question_votes_path(question),
+                    local: false,
                     id: "confirm-vote-form" do |form| %>
         <%= form.hidden_field :decidim_consultations_response_id, id: "decidim_consultations_response_id" %>
         <%= form.submit t("questions.vote_modal_confirm.confirm", scope: "decidim"),

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

@@ -56,4 +56,6 @@
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>

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.attached_uploader(:banner_image).path %>');">
+       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_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.attached_uploader(:banner_image).path %>');">
+       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/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:
@@ -270,9 +271,9 @@ ar:
       filters:
         active: نشيط
         all: الكل
+        date: التاريخ
         finished: تم الانتهاء من
         search: بحث
-        state: الحالة
         upcoming: القادمة
       filters_small_view:
         close_modal: أغلق النافذة

data/config/locales/bg.yml

@@ -1 +1,2 @@
+---
 bg:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ ca:
       filters:
         active: Actiu
         all: Totes
+        date: Data
         finished: Acabat
         search: Cerca
-        state: Estat
         upcoming: Proper
       filters_small_view:
         close_modal: Tanca la finestra

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -267,9 +268,9 @@ cs:
       filters:
         active: Aktivní
         all: Vše
+        date: Datum
         finished: Dokončeno
         search: Vyhledávání
-        state: Stav
         upcoming: Nadcházející
       filters_small_view:
         close_modal: Zavřete okno
@@ -329,7 +330,7 @@ cs:
       show:
         badge_name:
           finished: Dokončeno
-          open: Otevřeno
+          open: otevřeno
           open_votes: Hlasování zahájeno
           published_results: Publikované výsledky
         footer_button_text:

data/config/locales/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -251,9 +252,9 @@ de:
       filters:
         active: Aktiv
         all: Alle
+        date: Datum
         finished: Fertig
         search: Suche
-        state: Zustand
         upcoming: Bevorstehende
       filters_small_view:
         close_modal: Fenster schließen

data/config/locales/el.yml

@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -252,7 +253,6 @@ el:
         all: Όλα
         finished: Ολοκληρωμένες
         search: Αναζήτηση
-        state: Κατάσταση
         upcoming: Προσεχείς
       filters_small_view:
         close_modal: Κλείσιμο παραθύρου