decidim-elections 0.26.7 → 0.26.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6adf6a39f0158f835bbee4df71f54d22e338e11482e28a1ea241c052f90787
-  data.tar.gz: 4677017dfaa4318d866bfbbf78115243782b627035ae1bec46adff5b68e86435
+  metadata.gz: b32054a1fc9143e20c406cc0ae4aee863e9ba62a7fcf8d6e6ddb8e4b545a6890
+  data.tar.gz: e5c4cd1231931c8dcc16e2dc70a6342aca41ecebd28a22663ff5c586dda59c19
 SHA512:
-  metadata.gz: 60f51b35f2a326dcc472464a764a5c1149c814dd5e6d75194c35ecb82f527234b27d469754e5bc67e26f60f31a2531261bfb1b2d056151a88080a351b6a5812a
-  data.tar.gz: 0fd97e7011e5ddbb74d81687d74ef3d56352ffc6edf97395b12c211faf36357bcdfaf2f73eb05d280f2788ad6e574e47c7d63264ccf694de4f73bc6a95bc4a68
+  metadata.gz: '09f9dd3236344018700fc9229bc7dae5475967320573f77df2dedae8af72bb774985d4346f9d216f0a3de89acef1b59930416cf38adb022de00da6dc08f61c26'
+  data.tar.gz: 7563d634035423209a16ee4791a9f098435de2af6564fa7d53c416cfa8fe4975151edc6ddce71c7df48d85e59002c7d3207fab9ac8d2688589e7610a925ee7fd

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/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/environment.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+# Empty line for playing nice with tpope/vim-rails

data/config/locales/ar.yml

@@ -18,8 +18,6 @@ ar:
         models:
           answer:
             name: الإجابة
-          question:
-            name: سؤال
         steps:
           tally:
             invalid: كانت هناك مشكلة في الإبلاغ عن الأمين المفقود
@@ -42,6 +40,9 @@ ar:
           show:
             identification_keys:
               cancel: إلغاء
+      votes:
+        confirm:
+          answer: الإجابة
     votings:
       admin:
         models:

data/config/locales/ca.yml

@@ -216,7 +216,7 @@ ca:
           answer:
             name: Resposta
           election:
-            name: Votació
+            name: Elecció
           question:
             name: Pregunta
           trustee:
@@ -636,7 +636,7 @@ ca:
               upload_legend: Decidim té les teves claus públiques d'identificació, però el teu navegador encara no les té. Necessites importar l'arxiu amb les teves claus d'identificació al teu ordinador des de la còpia de seguretat que vas crear després de generar-les.
             not_supported_browser_description: Sembla que estàs usant un navegador que no pot ser utilitzat per a actuar com a garant. Assegura't que estàs usant la versió més recent del teu navegador, o intenta usar qualsevol dels navegadors més populars per a poder completar les teves tasques com a garant.
             not_supported_browser_title: Actualitza el navegador per a actuar com a garant
-            trustee_role_description: Se t'ha assignat com a garant en algunes de les eleccions celebrades en aquesta plataforma.
+            trustee_role_description: Has estat assignada com a garant en algunes de les eleccions celebrades en aquesta plataforma.
           update:
             success: La teva clau pública d'identificació va ser guardada amb èxit.
       votes:
@@ -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.
@@ -730,7 +730,7 @@ ca:
           continue: Següent
       warnings:
         no_elections_warning: No hi ha cap votació que coincideixi amb la teva cerca o no n'hi ha cap programada.
-        no_scheduled_elections_warning: Actualment no hi ha votacions programades, però pots veure les anteriors.
+        no_scheduled_elections_warning: Actualment no hi ha votacions programades, però pots veure un llistat de les anteriors.
     events:
       elections:
         election_published:
@@ -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:
@@ -1041,7 +1041,7 @@ ca:
             promoted: Destacada
             select_a_voting_type: Si us plau selecciona un tipus de votació
             slug: Nom curt d'URL
-            slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquest procés. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
+            slug_help: 'Els noms curts d''URL s''utilitzen per generar els URL que apunten a aquesta votació. Només accepta lletres, números i guions, i ha de començar amb una lletra. Exemple: %{url}'
             title: Títol
             voting_type:
               hybrid: Híbrida
@@ -1176,7 +1176,7 @@ ca:
           certify:
             add_images: Afegir imatges
             error: S'ha produït un error en adjuntar el certificat. Si us plau, prova de nou.
-            form_legend: Puja una imatge del certificat de tancament electoral
+            form_legend: Puja una imatge del Certificat de Tancament Electoral
             heading: Recompte de vots - Pujar certificat
             info_text: Si us plau, puja una imatge del certificat de tancament electoral.
             submit: Pujar el certificat
@@ -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

@@ -656,7 +656,6 @@ cs:
               upload_legend: Decidim má vaše veřejné identifikační klíče, ale váš prohlížeč jej stále nemá. Je třeba importovat soubor s identifikačními klíči do počítače ze zálohy, kterou jste vytvořili po jejich vygenerování.
             not_supported_browser_description: Vypadá to, že používáte webový prohlížeč, který nelze použít jako správce. Ujistěte se, že používáte nejnovější verzi prohlížeče, nebo zkuste použít některý z nejpopulárnějších prohlížečů, abyste mohli dokončit své úkoly správce.
             not_supported_browser_title: Upgradujte prohlížeč abyste mohl fungovat jako důvěrník
-            trustee_role_description: Byl jste pověřen, abyste v některých volbách, které na této platformě probíhají, jednal jako důvěrník.
           update:
             success: Váš identifikační veřejný klíč byl úspěšně uložen.
       votes:
@@ -750,7 +749,6 @@ cs:
           continue: Další
       warnings:
         no_elections_warning: Žádné volby neodpovídají zadaným kritériím nebo nejsou naplánovány žádné volby.
-        no_scheduled_elections_warning: V současné době nejsou žádné plánované volby, ale zde najdete všechny minulé volby na seznamu.
     events:
       elections:
         election_published:
@@ -1196,7 +1194,6 @@ cs:
           certify:
             add_images: Přidat obrázky
             error: Došlo k chybě při připojování certifikátu, zkuste to prosím znovu.
-            form_legend: Nahrajte prosím fotografii volebního certifikátu o uzavření
             heading: Přepočet hlasů - Nahrát certifikát
             info_text: Nahrajte prosím fotografii volebního certifikátu o uzavření.
             submit: Nahrát certifikát