decidim-elections 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99bd6d27a8d623f95597e8bb558703132558b09326f4194d9ee8dae29baf727f
-  data.tar.gz: d5088cc6d4d71cd37b4e473a801143fce1d885c31e1363226d2ee3707d41211d
+  metadata.gz: 11ba350fe95a17c5fdacb0d334da600c9661fefd43617ee0324655acc3a18bc8
+  data.tar.gz: 39b15243a85e5e7bc6d04bea37945c23e849a26e36ad421a855779ca2f681c8d
 SHA512:
-  metadata.gz: 7d827e944f1372437b6f826bb871dd926caa70d20c3df53f935c6bd9543a906dfb545295ad779c8fb96cad2d8331c302ed5e1aa1edfd0276969e0f64c20e028a
-  data.tar.gz: 7d454b5df4c42582c1d9cd4795bdb3bac04d9c52a41b677f006496ac85b86e9ae7118a096219df77883544d29c7c08ace050608cc4e58a1fec3b098db5206ee9
+  metadata.gz: fac8953cc1dca3a079f3970efe597a3cf19c63cf60dde0443c0511060881bd4b424a434cab13f544a8a4d31a8d571ae2593c1f65c1ee465af81b87c599dac1f2
+  data.tar.gz: 180c6299a0f8a5e8a5451396865d82824e01e858431e570e2279240d4bd7026e1abdd97f887e05739db83aab32bcb204cfdd7b9a1e9b7e14b4feb00d7f52ba03

data/README.md

@@ -8,7 +8,7 @@ The Elections module adds elections to any participatory space.
 
 Elections will be available as a Component for a Participatory Space.
 
-In order to celebrate [End-to-end auditable votings](https://en.wikipedia.org/wiki/End-to-end_auditable_voting_systems) using the Elections module, you will need to connect your Decidim instance with an instance of the [Decidim Bulletin Board application](https://github.com/decidim/decidim-bulletin-board/). To create this connection, please check the [instructions](https://github.com/decidim/decidim/blob/develop/docs/services/elections_bulletin_board.md).
+In order to celebrate [End-to-end auditable votings](https://en.wikipedia.org/wiki/End-to-end_auditable_voting_systems) using the Elections module, you will need to connect your Decidim instance with an instance of the [Decidim Bulletin Board application](https://github.com/decidim/decidim-bulletin-board/). To create this connection, please check the [instructions](https://docs.decidim.org/en/services/elections_bulletin_board/).
 
 ## Installation
 

data/app/cells/decidim/votings/content_blocks/highlighted_votings/show.erb

@@ -1,4 +1,4 @@
-<section class="wrapper-home home-section">
+<section id="highlighted_votings" class="wrapper-home home-section">
   <div class="row" id="highlighted-votings">
     <h3 class="section-heading"><%= t("active_votings", scope: i18n_scope) %></h3>
     <div class="row collapse">
@@ -8,7 +8,7 @@
           <div class="column">
             <%= link_to decidim_votings.voting_path(voting), class: "card card--voting card--mini" do %>
               <div aria-hidden="true" class="card__image-top"
-                style="background-image:url('<%= voting.attached_uploader(:banner_image).path %>')"></div>
+                style="background-image:url(<%= voting.attached_uploader(:banner_image).path %>)"></div>
               <div class="card__content">
                 <span class="card__title card__link"><%= translated_attribute voting.title %></span>
               </div>

data/app/cells/decidim/votings/content_blocks/highlighted_votings_cell.rb

@@ -6,10 +6,6 @@ module Decidim
       class HighlightedVotingsCell < Decidim::ViewModel
         delegate :current_user, to: :controller
 
-        cache :show, expires_in: 10.minutes, if: :perform_caching? do
-          cache_hash
-        end
-
         def show
           render if highlighted_votings.any?
         end
@@ -37,9 +33,12 @@ module Decidim
         def cache_hash
           hash = []
           hash.push(I18n.locale)
-          hash.push(highlighted_votings.map(&:cache_key_with_version))
           hash.join(Decidim.cache_key_separator)
         end
+
+        def cache_expiry_time
+          10.minutes
+        end
       end
     end
   end

data/app/cells/decidim/votings/content_blocks/landing_page/description/show.erb

@@ -1,4 +1,4 @@
-<div class="row section voting-description-cell mt-m">
+<div class="row section voting-description-cell">
   <div class="columns">
     <% if introductory_image.attached? %>
       <div id="introductory-image" class="columns medium-4 mediumlarge-5">

data/app/cells/decidim/votings/content_blocks/landing_page/description_cell.rb

@@ -16,7 +16,7 @@ module Decidim
           end
 
           def description_text
-            decidim_sanitize_editor_admin(translated_attribute(current_participatory_space.description))
+            decidim_sanitize_editor(translated_attribute(current_participatory_space.description))
           end
         end
       end

data/app/cells/decidim/votings/content_blocks/landing_page/header/show.erb

@@ -1,4 +1,4 @@
-<section class="extended hero" style="background-image:url('<%= current_participatory_space.attached_uploader(:banner_image).path %>');">
+<section class="extended hero" style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
   <div class="hero__container">
     <div class="row">
       <div class="columns large-10 text-left">
@@ -24,6 +24,6 @@
   </div>
 </section>
 
-<section>
+<section class="section">
   <%= extended_navigation_bar(navigation_items) %>
 </section>

data/app/cells/decidim/votings/content_blocks/landing_page/header_cell.rb

@@ -74,7 +74,7 @@ module Decidim
                   url: decidim_votings.voting_path(current_participatory_space),
                   active: is_active_link?(decidim_votings.voting_path(current_participatory_space), :exclusive)
                 },
-                if current_participatory_space.dataset.present?
+                if current_participatory_space.check_census_enabled?
                   {
                     name: t("layouts.decidim.voting_navigation.check_census"),
                     url: decidim_votings.voting_check_census_path(current_participatory_space),

data/app/commands/decidim/elections/admin/add_user_as_trustee.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the admin user creates a trustee
       # from the admin panel.
-      class AddUserAsTrustee < Rectify::Command
+      class AddUserAsTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

data/app/commands/decidim/elections/admin/create_answer.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates an Answer
       # from the admin panel.
-      class CreateAnswer < Rectify::Command
+      class CreateAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -38,7 +38,7 @@ module Decidim
         attr_reader :form, :answer, :gallery
 
         def invalid?
-          form.election.blocked? || form.invalid?
+          form.election.started? || form.invalid?
         end
 
         def create_answer

data/app/commands/decidim/elections/admin/create_election.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates an Election
       # from the admin panel.
-      class CreateElection < Rectify::Command
+      class CreateElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Question
       # from the admin panel.
-      class CreateQuestion < Rectify::Command
+      class CreateQuestion < Decidim::Command
         def initialize(form)
           @form = form
         end
@@ -14,7 +14,7 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          return broadcast(:election_started) if form.election.blocked?
+          return broadcast(:election_started) if form.election.started?
           return broadcast(:invalid) if form.invalid?
 
           create_question!

data/app/commands/decidim/elections/admin/destroy_answer.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys an Answer
       # from the admin panel.
-      class DestroyAnswer < Rectify::Command
+      class DestroyAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -31,7 +31,7 @@ module Decidim
         attr_reader :answer, :current_user
 
         def invalid?
-          answer.question.election.blocked?
+          answer.question.election.started?
         end
 
         def destroy_answer

data/app/commands/decidim/elections/admin/destroy_election.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys an Election
       # from the admin panel.
-      class DestroyElection < Rectify::Command
+      class DestroyElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -31,7 +31,7 @@ module Decidim
         attr_reader :election, :current_user
 
         def invalid?
-          election.blocked?
+          election.started?
         end
 
         def destroy_election!

data/app/commands/decidim/elections/admin/destroy_question.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Question
       # from the admin panel.
-      class DestroyQuestion < Rectify::Command
+      class DestroyQuestion < Decidim::Command
         def initialize(question, current_user)
           @question = question
           @current_user = current_user
@@ -27,7 +27,7 @@ module Decidim
         attr_reader :question, :current_user
 
         def invalid?
-          question.election.blocked?
+          question.election.started?
         end
 
         def destroy_question!

data/app/commands/decidim/elections/admin/end_vote.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to end the voting period in the Bulletin Board.
-      class EndVote < Rectify::Command
+      class EndVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A VotePeriodForm object with the information needed to start or end the vote period

data/app/commands/decidim/elections/admin/import_proposals_to_elections.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command is executed when an admin imports proposals from
       # one component to answers of elections component.
-      class ImportProposalsToElections < Rectify::Command
+      class ImportProposalsToElections < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -30,7 +30,7 @@ module Decidim
         attr_reader :form, :answer
 
         def invalid?
-          form.election.blocked? || form.invalid?
+          form.election.started? || form.invalid?
         end
 
         def create_answers_from_accepted_proposals
@@ -77,10 +77,7 @@ module Decidim
         end
 
         def proposal_already_copied?(original_proposal)
-          # Note: we are including also answers from unpublished components
-          # because otherwise duplicates could be created until the component is
-          # published.
-          original_proposal.linked_resources(:answers, "related_proposals", component_published: false).any? do |answer|
+          original_proposal.linked_resources(:answers, "related_proposals").any? do |answer|
             answer.question == target_question
           end
         end

data/app/commands/decidim/elections/admin/publish_election.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is published from the admin panel.
-      class PublishElection < Rectify::Command
+      class PublishElection < Decidim::Command
         # Public: Initializes the command.
         #
         # election - The election to publish.
@@ -19,7 +19,7 @@ module Decidim
         # Broadcasts :ok if published, :invalid otherwise.
         def call
           publish_election
-          publish_event unless election.previously_published?
+          publish_event
 
           broadcast(:ok, election)
         end

data/app/commands/decidim/elections/admin/publish_results.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to publish the election results in the Bulletin Board.
-      class PublishResults < Rectify::Command
+      class PublishResults < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to publish the results

data/app/commands/decidim/elections/admin/remove_trustee_from_participatory_space.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the admin user removes a trustee
       # from a participatory space from the admin panel.
-      class RemoveTrusteeFromParticipatorySpace < Rectify::Command
+      class RemoveTrusteeFromParticipatorySpace < Decidim::Command
         # Public: Initializes the command.
         #
         # trustee_participatory_space - A trustee_participatory_space

data/app/commands/decidim/elections/admin/report_missing_trustee.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to report a missing trustee during the tally process.
-      class ReportMissingTrustee < Rectify::Command
+      class ReportMissingTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A ReportMissingTrusteeForm object with the information needed to report the missing trustee.

data/app/commands/decidim/elections/admin/setup_election.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is setup from the admin panel.
-      class SetupElection < Rectify::Command
+      class SetupElection < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A SetupForm object with the information needed to setup the election

data/app/commands/decidim/elections/admin/start_key_ceremony.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the key ceremony in the Bulletin Board.
-      class StartKeyCeremony < Rectify::Command
+      class StartKeyCeremony < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to perform an action

data/app/commands/decidim/elections/admin/start_tally.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the tally in the Bulletin Board.
-      class StartTally < Rectify::Command
+      class StartTally < Decidim::Command
         # Public: Initializes the command.
         #
         # form - An ActionForm object with the information needed to perform an action

data/app/commands/decidim/elections/admin/start_vote.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called to start the voting period in the Bulletin Board.
-      class StartVote < Rectify::Command
+      class StartVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A VotePeriodForm object with the information needed to start or end the vote period

data/app/commands/decidim/elections/admin/unpublish_election.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command gets called when a election is unpublished from the admin panel.
-      class UnpublishElection < Rectify::Command
+      class UnpublishElection < Decidim::Command
         # Public: Initializes the command.
         #
         # election - The election to unpublish.

data/app/commands/decidim/elections/admin/update_action_status.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       # This command updates the status of the action and the election if it got changed
-      class UpdateActionStatus < Rectify::Command
+      class UpdateActionStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # action - The pending action to be updated

data/app/commands/decidim/elections/admin/update_answer.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates an Answer
       # from the admin panel.
-      class UpdateAnswer < Rectify::Command
+      class UpdateAnswer < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -41,7 +41,7 @@ module Decidim
         attr_reader :form, :answer, :gallery
 
         def invalid?
-          form.election.blocked? || form.invalid?
+          form.election.started? || form.invalid?
         end
 
         def update_answer

data/app/commands/decidim/elections/admin/update_answer_selection.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when an admin marks an answer
       # as selected.
-      class UpdateAnswerSelection < Rectify::Command
+      class UpdateAnswerSelection < Decidim::Command
         def initialize(answer, selected)
           @answer = answer
           @selected = selected

data/app/commands/decidim/elections/admin/update_election.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates an Election
       # from the admin panel.
-      class UpdateElection < Rectify::Command
+      class UpdateElection < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates a Question
       # from the admin panel.
-      class UpdateQuestion < Rectify::Command
+      class UpdateQuestion < Decidim::Command
         def initialize(form, question)
           @form = form
           @question = question
@@ -27,7 +27,7 @@ module Decidim
         attr_reader :form, :question
 
         def invalid?
-          question.election.blocked? || form.invalid?
+          question.election.started? || form.invalid?
         end
 
         def update_question!

data/app/commands/decidim/elections/admin/update_trustee_participatory_space.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates a trustee
       # status from the admin panel.
-      class UpdateTrusteeParticipatorySpace < Rectify::Command
+      class UpdateTrusteeParticipatorySpace < Decidim::Command
         # Public: Initializes the command.
         #
         # trustee_participatory_space - A trustee_participatory_space

data/app/commands/decidim/elections/trustee_zone/update_election_bulletin_board_status.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module TrusteeZone
       # This command updates the election status if it got changed
-      class UpdateElectionBulletinBoardStatus < Rectify::Command
+      class UpdateElectionBulletinBoardStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # status - The actual election status

data/app/commands/decidim/elections/trustee_zone/update_trustee.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module TrusteeZone
       # This command allows the user to update their trustee information
-      class UpdateTrustee < Rectify::Command
+      class UpdateTrustee < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with the new trustee information

data/app/commands/decidim/elections/voter/cast_vote.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Voter
       # This command allows the user to store and cast their vote.
-      class CastVote < Rectify::Command
+      class CastVote < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form with necessary info to cast a vote.

data/app/commands/decidim/elections/voter/update_vote_status.rb

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Voter
       # This command updates the vote status and sends a notification.
-      class UpdateVoteStatus < Rectify::Command
+      class UpdateVoteStatus < Decidim::Command
         # Public: Initializes the command.
         #
         # vote        - the vote that has been updated
@@ -74,7 +74,7 @@ module Decidim
             }
           }
 
-          Decidim::EventsManager.publish(data)
+          Decidim::EventsManager.publish(**data)
         end
 
         def send_vote_email

data/app/commands/decidim/votings/admin/create_ballot_style.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create the ballot style
-      class CreateBallotStyle < Rectify::Command
+      class CreateBallotStyle < Decidim::Command
         def initialize(form)
           @form = form
         end

data/app/commands/decidim/votings/admin/create_monitoring_committee_member.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create a new monitoring committee member
-      class CreateMonitoringCommitteeMember < Rectify::Command
+      class CreateMonitoringCommitteeMember < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params

data/app/commands/decidim/votings/admin/create_polling_officer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to create a new polling officer
-      class CreatePollingOfficer < Rectify::Command
+      class CreatePollingOfficer < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params

data/app/commands/decidim/votings/admin/create_voting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with all the business logic when creating a new voting space
-      class CreateVoting < Rectify::Command
+      class CreateVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -51,7 +51,8 @@ module Decidim
             banner_image: form.banner_image,
             introductory_image: form.introductory_image,
             voting_type: form.voting_type,
-            census_contact_information: form.census_contact_information
+            census_contact_information: form.census_contact_information,
+            show_check_census: form.show_check_census
           )
         end
       end

data/app/commands/decidim/votings/admin/destroy_ballot_style.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to delete the ballot style
-      class DestroyBallotStyle < Rectify::Command
+      class DestroyBallotStyle < Decidim::Command
         def initialize(ballot_style, current_user)
           @ballot_style = ballot_style
           @current_user = current_user

data/app/commands/decidim/votings/admin/destroy_monitoring_committee_member.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to destroy a monitoring committee member
-      class DestroyMonitoringCommitteeMember < Rectify::Command
+      class DestroyMonitoringCommitteeMember < Decidim::Command
         # Public: Initializes the command.
         #
         # monitoring_committee_member - the MonitoringCommitteeMember to destroy

data/app/commands/decidim/votings/admin/destroy_polling_officer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the business logic to destroy a poling officer
-      class DestroyPollingOfficer < Rectify::Command
+      class DestroyPollingOfficer < Decidim::Command
         # Public: Initializes the command.
         #
         # polling_officer - the PollingOfficer to destroy

data/app/commands/decidim/votings/admin/destroy_polling_station.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a polling station
       # from the admin panel.
-      class DestroyPollingStation < Rectify::Command
+      class DestroyPollingStation < Decidim::Command
         def initialize(polling_station, current_user)
           @polling_station = polling_station
           @current_user = current_user

data/app/commands/decidim/votings/admin/manage_polling_station.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with the shared business logic to manage a polling station
-      class ManagePollingStation < Rectify::Command
+      class ManagePollingStation < Decidim::Command
         def manage_polling_officers(polling_station, president_id, managers_ids)
           manage_president(polling_station, president_id)
           manage_managers(polling_station, managers_ids)
@@ -14,7 +14,7 @@ module Decidim
 
         def manage_president(polling_station, president_id)
           unassign_president(polling_station)
-          return if president_id.nil?
+          return if president_id.blank?
 
           assign_president(president_id, polling_station)
           notify_officer(president_id, polling_station.voting)

data/app/commands/decidim/votings/admin/monitoring_committee_validate_polling_station_closure.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # A command with all the business logic for a monitornig committee member to validate a polling station closure
-      class MonitoringCommitteeValidatePollingStationClosure < Rectify::Command
+      class MonitoringCommitteeValidatePollingStationClosure < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.

data/app/commands/decidim/votings/admin/publish_voting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # This command gets called when a voting is published from the admin panel.
-      class PublishVoting < Rectify::Command
+      class PublishVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # voting - The voting to publish.

data/app/commands/decidim/votings/admin/unpublish_voting.rb

@@ -4,7 +4,7 @@ module Decidim
   module Votings
     module Admin
       # This command gets called when a voting is unpublished from the admin panel.
-      class UnpublishVoting < Rectify::Command
+      class UnpublishVoting < Decidim::Command
         # Public: Initializes the command.
         #
         # voting - The voting to unpublish.