decidim-consultations 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 430cbcb1070cb14328cf12a1537ec077224271351181b4862d182bf7f4609ae0
-  data.tar.gz: 99beaff5b1d41354f2f20834c3ad13451cea285e040fd89e998386bad680d2d8
+  metadata.gz: ed2b64c4b2a1e4fe0318cc12cfab14df6d0d890bd1a92cfd67dd00fdb6333d18
+  data.tar.gz: 9d68171ea724aa3f93c18a9e9f2d4b88da2bc8f3dd244cdc2d223fc69f7929d3
 SHA512:
-  metadata.gz: af792d4208dc86cc8e6e72e6487b03de2ee003a9974f17d4fea3884d8c01d114d7cf06cd0b9fde43793938fe8ad5f492ca77c619f8b521e69e9e562c906cfdf1
-  data.tar.gz: d9a8def4b310e358fe87cdd0e7d82c59c97b4f567de180ee678f3318a44d52a380e88beee488f936ff1ad771a52ecd7374c59e0b717db38b4298a7087bb12bf2
+  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">

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/concerns/decidim/consultations/needs_consultation.rb

@@ -38,7 +38,7 @@ module Decidim
 
         def detect_consultation
           request.env["current_consultation"] ||
-            organization_consultations.find_by(slug: params[:consultation_slug] || params[:slug])
+            organization_consultations.find_by!(slug: params[:consultation_slug] || params[:slug])
         end
 
         def organization_consultations

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

@@ -82,8 +82,10 @@ module Decidim
         private
 
         def detect_question
+          return unless request.env["current_question"] || params[:question_slug] || params[:slug]
+
           request.env["current_question"] ||
-            OrganizationQuestions.for(current_organization).find_by(slug: params[:question_slug] || params[:slug])
+            OrganizationQuestions.for(current_organization).find_by!(slug: params[:question_slug] || params[:slug])
         end
 
         def detect_consultation

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/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/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

@@ -40,20 +40,22 @@
 
     <div class="columns medium-5">
       <% unless translated_attribute(current_question.origin_scope).blank? %>
-        <h4 class="heading6"><%= t "question.origin_scope", scope: "activemodel.attributes" %></h4>
+        <h3 class="heading6"><%= t "question.origin_scope", scope: "activemodel.attributes" %></h3>
         <p><%= translated_attribute current_question.origin_scope %></p>
       <% end %>
 
-      <h4 class="heading6"><%= t "question.promoter_group", scope: "activemodel.attributes" %></h4>
+      <h3 class="heading6"><%= t "question.promoter_group", scope: "activemodel.attributes" %></h3>
       <p><%= translated_attribute current_question.promoter_group %></p>
 
-      <h4 class="heading6"><%= t "question.scope", scope: "activemodel.attributes" %></h4>
+      <h3 class="heading6"><%= t "question.scope", scope: "activemodel.attributes" %></h3>
       <p><%= translated_attribute current_question.scope.name %></p>
 
-      <h4 class="heading6"><%= t "question.participatory_scope", scope: "activemodel.attributes" %></h4>
+      <h3 class="heading6"><%= t "question.participatory_scope", scope: "activemodel.attributes" %></h3>
       <p><%= translated_attribute current_question.participatory_scope %></p>
     </div>
   </div>
 <% end %>
 
-<%= javascript_pack_tag "decidim_consultations" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_consultations" %>
+<% end %>

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

@@ -1,36 +1,21 @@
-<div class="row column">
-  <div class="process-nav consultations-nav">
-    <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
-      <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
-      <span class="process-nav__link">
-        <% if self.try(:current_component) %>
-          <%= component_icon(current_component) %>
-          <%= translated_attribute(current_component.name) %>
-        <% else %>
-          <%= external_icon "media/images/decidim_pages.svg", role: "img", "aria-hidden": true %>
-          <%= t ".question_menu_item" %>
-        <% end %>
-      </span>
-    </button>
+<div class="row column consultations-nav">
+  <%
+    components = question.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
+  %>
 
-    <%
-      components = question.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
-    %>
-
-    <%=
-      extended_navigation_bar([
-        {
-          name: t(".question_menu_item"),
-          url: decidim_consultations.question_path(question),
-          active: is_active_link?(decidim_consultations.question_path(question), :exclusive)
-        }
-      ] + components.map do |component|
-        {
-          name: translated_attribute(component.name),
-          url: main_component_path(component),
-          active: is_active_link?(main_component_path(component), :inclusive)
-        }
-      end)
-    %>
-  </div>
+  <%=
+    extended_navigation_bar([
+      {
+        name: t(".question_menu_item"),
+        url: decidim_consultations.question_path(question),
+        active: is_active_link?(decidim_consultations.question_path(question), :exclusive)
+      }
+    ] + components.map do |component|
+      {
+        name: translated_attribute(component.name),
+        url: main_component_path(component),
+        active: is_active_link?(main_component_path(component), :inclusive)
+      }
+    end)
+  %>
 </div>

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

@@ -23,10 +23,10 @@
 <%= yield :question_header_instructions if content_for? :question_header_instructions %>
 
 <div class="row column consultations-title">
-  <h1 class="heading2"><%= decidim_sanitize translated_attribute question.title %></h1>
+  <h2 class="heading2"><%= decidim_sanitize translated_attribute question.title %></h2>
   <% unless question.hashtag.blank? %>
     <div class="text-center">
-      <%= link_to "##{question.hashtag}", "https://twitter.com/hashtag/#{question.hashtag}", target: "_blank" %>
+      <%= link_to "##{question.hashtag}", twitter_hashtag_url(question.hashtag), target: "_blank" %>
     </div>
   <% end %>
 

data/config/locales/am-ET.yml

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