decidim-elections 0.26.7 → 0.26.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6adf6a39f0158f835bbee4df71f54d22e338e11482e28a1ea241c052f90787
-  data.tar.gz: 4677017dfaa4318d866bfbbf78115243782b627035ae1bec46adff5b68e86435
+  metadata.gz: 786343e6be9c50d6b789d4fa5fb26ef66c0ed984ca72e62dfa376d5664642310
+  data.tar.gz: dcfe8ab018b810d8ce7c694f05c545966e5b21c947be3594db0a9ae7dab79908
 SHA512:
-  metadata.gz: 60f51b35f2a326dcc472464a764a5c1149c814dd5e6d75194c35ecb82f527234b27d469754e5bc67e26f60f31a2531261bfb1b2d056151a88080a351b6a5812a
-  data.tar.gz: 0fd97e7011e5ddbb74d81687d74ef3d56352ffc6edf97395b12c211faf36357bcdfaf2f73eb05d280f2788ad6e574e47c7d63264ccf694de4f73bc6a95bc4a68
+  metadata.gz: e14eabe02a500e64ef20e5b204057e7036af7b11690f08a3f7df7e533fbc9cede6ce6f5084f8a3d5b2f2b70525fbea5e8d6dd50a7d922da91b85ec1f94c7175c
+  data.tar.gz: 511ee2f08dc98e56bbb53ba3d2b884a1ab68effd61fe7478469a42e4772df006e16043a3b8989d09982f7c52bf35e608cf99d178f68c92512f5314fb1add487e

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

@@ -38,7 +38,7 @@ module Decidim
         attr_reader :form, :answer, :gallery
 
         def invalid?
-          form.election.started? || form.invalid?
+          form.election.blocked? || form.invalid?
         end
 
         def create_answer

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

@@ -14,7 +14,7 @@ module Decidim
         #
         # Broadcasts :ok if successful, :invalid otherwise.
         def call
-          return broadcast(:election_started) if form.election.started?
+          return broadcast(:election_started) if form.election.blocked?
           return broadcast(:invalid) if form.invalid?
 
           create_question!

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

@@ -31,7 +31,7 @@ module Decidim
         attr_reader :answer, :current_user
 
         def invalid?
-          answer.question.election.started?
+          answer.question.election.blocked?
         end
 
         def destroy_answer

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

@@ -31,7 +31,7 @@ module Decidim
         attr_reader :election, :current_user
 
         def invalid?
-          election.started?
+          election.blocked?
         end
 
         def destroy_election!

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

@@ -27,7 +27,7 @@ module Decidim
         attr_reader :question, :current_user
 
         def invalid?
-          question.election.started?
+          question.election.blocked?
         end
 
         def destroy_question!

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

@@ -30,7 +30,7 @@ module Decidim
         attr_reader :form, :answer
 
         def invalid?
-          form.election.started? || form.invalid?
+          form.election.blocked? || form.invalid?
         end
 
         def create_answers_from_accepted_proposals

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

@@ -41,7 +41,7 @@ module Decidim
         attr_reader :form, :answer, :gallery
 
         def invalid?
-          form.election.started? || form.invalid?
+          form.election.blocked? || form.invalid?
         end
 
         def update_answer

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

@@ -27,7 +27,7 @@ module Decidim
         attr_reader :form, :question
 
         def invalid?
-          question.election.started? || form.invalid?
+          question.election.blocked? || form.invalid?
         end
 
         def update_question!

data/app/controllers/decidim/elections/admin/trustees_participatory_spaces_controller.rb

@@ -72,7 +72,7 @@ module Decidim
         private
 
         def trustee_participatory_space
-          @trustee_participatory_space ||= TrusteesParticipatorySpace.find_by(id: params[:id])
+          @trustee_participatory_space ||= TrusteesParticipatorySpace.find_by(id: params[:id], participatory_space: current_participatory_space)
         end
 
         def trustees

data/app/controllers/decidim/elections/trustee_zone/application_controller.rb

@@ -13,6 +13,11 @@ module Decidim
 
         before_action :ensure_configured_bulletin_board!
 
+        register_permissions(::Decidim::Elections::TrusteeZone::ApplicationController,
+                             ::Decidim::Elections::Permissions,
+                             ::Decidim::Admin::Permissions,
+                             ::Decidim::Permissions)
+
         private
 
         def ensure_configured_bulletin_board!
@@ -34,10 +39,7 @@ module Decidim
         end
 
         def permission_class_chain
-          [
-            Decidim::Elections::Permissions,
-            Decidim::Permissions
-          ]
+          ::Decidim.permissions_registry.chain_for(::Decidim::Elections::TrusteeZone::ApplicationController)
         end
       end
     end

data/app/controllers/decidim/votings/admin/exports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module Admin
+      # This controller allows exporting things.
+      # It is targeted for customizations for exporting things that lives under
+      # a participatory process.
+      class ExportsController < Decidim::Admin::ExportsController
+        include VotingAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/votings/admin/reminders_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module Admin
+      # This controller allows to send reminders.
+      # It is targeted for customizations for reminder things that lives under
+      # votings.
+      class RemindersController < Decidim::Admin::RemindersController
+        include VotingAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/votings/admin/votings_landing_page_content_blocks_controller.rb

@@ -18,7 +18,7 @@ module Decidim
         end
 
         def scoped_resource
-          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug])
+          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug], organization: current_organization)
         end
 
         def enforce_permission_to_update_resource

data/app/controllers/decidim/votings/admin/votings_landing_page_controller.rb

@@ -16,7 +16,7 @@ module Decidim
         end
 
         def scoped_resource
-          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug])
+          @scoped_resource ||= Voting.find_by(slug: params[:voting_slug], organization: current_organization)
         end
 
         def enforce_permission_to_update_resource

data/app/controllers/decidim/votings/polling_officer_zone/closures_controller.rb

@@ -111,7 +111,11 @@ module Decidim
         end
 
         def election
-          @election ||= Decidim::Elections::Election.includes(questions: :answers).find_by(id: params[:election_id])
+          @election ||= Decidim::Elections::Election
+                        .joins("INNER JOIN decidim_components component ON component.id = decidim_elections_elections.decidim_component_id")
+                        .where(component: { participatory_space: current_organization.participatory_spaces })
+                        .includes(questions: :answers)
+                        .find_by(id: params[:election_id])
         end
 
         def polling_station

data/app/controllers/decidim/votings/polling_officer_zone/in_person_votes_controller.rb

@@ -121,7 +121,11 @@ module Decidim
         end
 
         def election
-          @election ||= Decidim::Elections::Election.find(params[:election_id])
+          @election ||= Decidim::Elections::Election
+                        .joins("INNER JOIN decidim_components component ON component.id = decidim_elections_elections.decidim_component_id")
+                        .where(component: { participatory_space: current_organization.participatory_spaces })
+                        .includes(questions: :answers)
+                        .find_by(id: params[:election_id])
         end
 
         def polling_officer

data/app/controllers/decidim/votings/votings_controller.rb

@@ -99,7 +99,7 @@ module Decidim
       end
 
       def election
-        @election ||= Decidim::Elections::Election.find(params[:election_id])
+        @election ||= Decidim::Elections::Election.where(component: current_participatory_space.components).find(params[:election_id])
       end
 
       def elections

data/app/forms/decidim/elections/admin/setup_form.rb

@@ -41,7 +41,8 @@ module Decidim
             [:max_selections, {}, election.valid_questions?],
             [:published, {}, election.published_at.present?],
             [:component_published, {}, election.component.published?],
-            [:time_before, { hours: Decidim::Elections.setup_minimum_hours_before_start }, election.minimum_hours_before_start?],
+            [:time_before, { hours: I18n.t("datetime.distance_in_words.x_hours", count: Decidim::Elections.setup_minimum_hours_before_start) },
+             election.minimum_hours_before_start?],
             [:trustees_number, { number: bulletin_board.number_of_trustees }, participatory_space_trustees_with_public_key.size >= bulletin_board.number_of_trustees]
           ].freeze
         end

data/app/forms/decidim/votings/admin/voting_role_form.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Votings
+    module Admin
+      # Base class to be inherited by other forms that have roles
+      # in the Votings space
+      class VotingRoleForm < Decidim::Form
+        attribute :name, String
+        attribute :email, String
+        attribute :user_id, Integer
+        attribute :existing_user, Boolean, default: false
+
+        validates :email, presence: true, format: { with: ::Devise.email_regexp }, unless: ->(form) { form.existing_user }
+        validates :name, presence: true, format: { with: UserBaseEntity::REGEXP_NAME }, unless: ->(form) { form.existing_user }
+        validates :user, presence: true, if: ->(form) { form.existing_user }
+
+        def map_model(model)
+          self.user_id = model.decidim_user_id
+          self.existing_user = user_id.present?
+        end
+
+        def user
+          @user ||= current_organization.users.find_by(id: user_id)
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/elections/admin/permissions.rb

@@ -24,10 +24,8 @@ module Decidim
             case permission_action.action
             when :create, :read
               allow!
-            when :delete, :update, :unpublish
+            when :delete, :update, :unpublish, :publish
               allow_if_not_blocked
-            when :publish
-              allow_if_valid_and_not_blocked
             end
           when :trustees
             case permission_action.action
@@ -80,10 +78,6 @@ module Decidim
           toggle_allow(election && !election.blocked?)
         end
 
-        def allow_if_valid_and_not_blocked
-          toggle_allow(election && !election.blocked? && election.valid_questions?)
-        end
-
         def allow_if_not_related_to_any_election
           toggle_allow(trustee_participatory_space.trustee.elections.empty?)
         end

data/app/permissions/decidim/votings/admin/permissions.rb

@@ -132,7 +132,7 @@ module Decidim
           when :ballot_styles
             toggle_allow(user.admin?) if permission_action.action == :read
           when :component_data
-            toggle_allow(user.admin?) if permission_action.action == :import
+            toggle_allow(user.admin?) if [:import, :export].member? permission_action.action
           end
         end
 

data/app/views/decidim/elections/admin/elections/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form edit_election" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/elections/admin/elections/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/elections/admin/elections/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, html: { class: "form new_election" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/elections/admin/trustees_participatory_spaces/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <div class="card" id="trustees">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/elections/admin/trustees_participatory_spaces/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for(@form, url: trustees_path, html: { class: "form new_trustee" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/votings/admin/ballot_styles/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for([current_voting, @form], url: { action: "update" }, html: { class: "form edit_ballot_style" })  do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/votings/admin/ballot_styles/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <div class="callout warning">
   <%= icon "info" %>
   <span class="callout-text"><%= t("explanation_callout", scope: "decidim.votings.admin.ballot_styles.index") %></span>

data/app/views/decidim/votings/admin/ballot_styles/new.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t(".title")) %>
 <%= decidim_form_for([current_participatory_space, @form], html: { class: "form new_ballot_style" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 

data/app/views/decidim/votings/admin/votings/edit.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("votings.edit.update", scope: "decidim.votings.admin")) %>
 <%= decidim_form_for @form,
                      method: :patch,
                      url: voting_path(@current_voting),

data/app/views/decidim/votings/admin/votings/index.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("decidim.votings.admin.titles.votings")) %>
 <div class="card with-overflow" id="votings">
   <div class="card-divider">
     <h2 class="card-title">

data/app/views/decidim/votings/admin/votings/new.html.erb

@@ -1,5 +1,4 @@
 <% add_decidim_page_title(t("votings.new.title", scope: "decidim.votings.admin")) %>
-
 <h2 class="voting-title-summary">
   <%= t("votings.new.title", scope: "decidim.votings.admin") %>
 </h2>

data/app/views/decidim/votings/census/admin/census/show.html.erb

@@ -1,3 +1,4 @@
+<% add_decidim_page_title(t("show.heading", scope: "decidim.votings.census.admin.census")) %>
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">

data/config/locales/ar.yml

@@ -42,6 +42,9 @@ ar:
           show:
             identification_keys:
               cancel: إلغاء
+      votes:
+        confirm:
+          answer: الإجابة
     votings:
       admin:
         models:

data/config/locales/ca.yml

@@ -684,10 +684,10 @@ ca:
         header:
           ballot_decision: Envia o audita el teu vot
           casting: El vot s'està dipositant
-          confirm: Confirma el teu vot
+          confirm: Confirmar el teu vot
           confirmed: Vot confirmat
           encrypting: El vot s'està xifrant
-          failed: Error en el vot
+          failed: Vot fallit
         messages:
           invalid_token: La sessió de la cabina de votació no és vàlida. Prova de votar de nou.
           not_allowed: No pots votar en aquesta votació en aquest moment.
@@ -818,15 +818,15 @@ ca:
             description:
               name: Descripció de la votació
             elections:
-              name: Eleccions de la votació
+              name: Eleccions
             header:
               name: Capçalera de la votació
             html_block_1:
-              name: Bloc html 1 de votació
+              name: Bloc html 1 de la votació
             html_block_2:
-              name: Bloc html 2 de votació
+              name: Bloc html 2 de la votació
             html_block_3:
-              name: Bloc html 3 de votació
+              name: Bloc html 3 de la votació
             metrics:
               name: Mètriques de la votació
             polling_stations:
@@ -1404,7 +1404,7 @@ ca:
         footer_button_text:
           participate: Participa
           view: Veure
-          vote: Vota
+          vote: Votar
         unspecified: Sense especificar
         voting_type:
           hybrid: Híbrida

data/config/locales/cs.yml

@@ -833,14 +833,10 @@ cs:
           highlighted_votings:
             max_results: Maximální počet prvků k zobrazení
           landing_page:
-            attachments_and_folders:
-              name: Přílohy a složky hlasování
             description:
               name: Popis hlasování
             elections:
               name: Hlasovací volby
-            header:
-              name: Záhlaví hlasování
             html_block_1:
               name: Html blok 1 hlasování
             html_block_2: