decidim-action_delegator 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caf66583f72b3582a54d1ab049356ba76fffb5031e4d4ca214c67c80778a4d0f
-  data.tar.gz: 29eed3db878b8d08aca87938cc96796894a39b9354a19a593b43afd7af5caa61
+  metadata.gz: ca4612ec0f7ff48ca4db9c6ce96adf9563afd16c898b45333fc3e63177c70454
+  data.tar.gz: f503d3d4b9d4ab544e60909c1907aff6b405cbe54dce8eab3330c7e718ea6b50
 SHA512:
-  metadata.gz: 31c6a9dfcacb203062d281cac13c75e1cc972be68872026135c9334800bfb6191d02d0e10433bb50077aa4da8e168e86f23fb313d3a672280ba7309740222c16
-  data.tar.gz: ab3a8ff8260a1713c58fe5db966f98370fa3e5f7dbf04eda01ba7039b3b9cb590d20f5c6f81bdc9ca663a3cc1f1dd6bf2667de3a06b267713abc94a365fa91fb
+  metadata.gz: 8a32dd04273f2f27ee30969e638ec3341365214fdaa22ec37cdbe0a6d2a2cb4c98c1bd78b680eb2cc162a48fd2b7277993f6b85180ab1e51357bdf53d6c791aa
+  data.tar.gz: e4629f6b1eb8d5debdb3bafabce31563f5d63ffbf498909068e317dfb2a13311f1753035d7def22c3c4dc16b0760a626627079a08942372d1671592d3964ac19

data/README.md

@@ -47,7 +47,7 @@ bundle exec rails db:migrate
 > If you are upgrading from a previous version, you need to run the migrations again and import all membership types/weights into the built-in census by executing in your production server:
 >
 > ```bash
-> RAILS_ENV=production bundle exec rails decidim_action_delegator:import_direct_verifications
+> RAILS_ENV=production bundle exec rails action_delegator:import_direct_verifications
 > ```
 >
 > *It is safe to run the previous command multiple times, no content will be imported twice.*

data/app/overrides/decidim/consultations/consultations/_regular_questions/prevent_empty_questions.html.erb.deface

@@ -0,0 +1,10 @@
+<!-- replace 'erb[silent]:contains("if consultation.questions.any?")' -->
+
+<%
+show_questions = if Decidim::ActionDelegator.remove_duplicated_highlighted_questions
+                   consultation.questions.count > consultation.highlighted_questions.count
+                 else
+                    consultation.questions.any?
+                 end
+%>
+<% if show_questions %>

data/app/overrides/decidim/consultations/consultations/_regular_questions/remove_highlighted_scopes.html.erb.deface

@@ -1,4 +1,5 @@
 <!-- replace 'h3.heading6' -->
 
-<% next if current_consultation.highlighted_scope == questions.first.scope %>
-<h3 class="heading6"><%= translated_attribute questions&.first&.scope&.name %></h3>
+<% next if questions.blank? %>
+<% next if Decidim::ActionDelegator.remove_duplicated_highlighted_questions && current_consultation.highlighted_scope == questions.first.scope %>
+<h3 class="heading6"><%= translated_attribute questions&.first&.scope&.name %></h3>

data/app/overrides/decidim/consultations/questions/_vote_button/add_delegations_link.html.erb.deface

@@ -1,3 +1,3 @@
 <!-- insert_before "erb[silent]:contains('elsif question.consultation.active?')" -->
 
-<%= render partial: "decidim/action_delegator/consultations/questions/link_to_delegations", locals: { question: question } %>
+<%= render partial: "decidim/action_delegator/consultations/questions/link_to_delegations", locals: { question: question } %>

data/app/overrides/decidim/consultations/questions/_vote_button/add_modal.html.erb.deface

@@ -1,3 +1,3 @@
 <!-- insert_before "erb[loud]:contains('javascript_pack_tag')" -->
 
-<%= render partial: "decidim/action_delegator/consultations/questions/delegations_modal", locals: { question: question } %>
+<%= render partial: "decidim/action_delegator/consultations/questions/delegations_modal", locals: { question: question } %>

data/app/overrides/decidim/consultations/questions/_vote_button/replace_delegation_to_multivote_link.html.erb.deface

@@ -1,4 +1,4 @@
-<!-- replace_contents "erb[silent]:contains('if question.multiple?')" 
+<!-- replace_contents "erb[silent]:contains('if question.multiple?')"
      closing_selector "erb[silent]:contains('else')" -->
 
 <%= link_to decidim_consultations.question_question_multiple_votes_path(question, delegation: 0),

data/lib/decidim/action_delegator/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   # This holds the decidim-action_delegator version.
   module ActionDelegator
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
     DECIDIM_VERSION = "0.26.5"
     COMPAT_DECIDIM_VERSION = [">= 0.26.0", "< 0.27"].freeze
   end

data/lib/decidim/action_delegator.rb

@@ -48,6 +48,12 @@ module Decidim
     config_accessor :remove_consultation_deprecation_warning do
       true
     end
+
+    # In a consultation the highlighted questions are duplicated in the list of regular questions
+    # this maintains the highlighted questions in the highlighted list and removes them from the regular list
+    config_accessor :remove_duplicated_highlighted_questions do
+      true
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-action_delegator
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Pau Pérez Fabregat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -203,6 +203,7 @@ files:
 - app/models/decidim/action_delegator/unversioned_vote.rb
 - app/models/decidim/action_delegator/whodunnit_vote.rb
 - app/overrides/decidim/consultations/consultations/_question/add_delegation_link.html.erb.deface
+- app/overrides/decidim/consultations/consultations/_regular_questions/prevent_empty_questions.html.erb.deface
 - app/overrides/decidim/consultations/consultations/_regular_questions/remove_highlighted_scopes.html.erb.deface
 - app/overrides/decidim/consultations/question_multiple_votes/_form/add_delegation_notice.html.erb.deface
 - app/overrides/decidim/consultations/questions/_vote_button/add_delegations_link.html.erb.deface