decidim-elections 0.32.0.rc2 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed28042a5ba0fce7e077a20442c88ba8aa8d8e3521fc4e2f9f6a8ccda083757
-  data.tar.gz: 297dcd5aa0f624246f8fc9c0e657b7cf6c734e299f3da9ec5495fcdaa29e2b87
+  metadata.gz: f80baff21385dc905505e8bc2a2995787b1e9b1ceb6b469e08b98e5670a2e442
+  data.tar.gz: 94e0059a6c03597bc4877ee5ff2027788314f3778f9dba467ced700784883e96
 SHA512:
-  metadata.gz: 0f0cac1305197050665c4f751d57643818f76b99966e180993a78044fb367f75c71b2dab404fff2a5ae247465d1c0b6c1fdaa36fb553693e2ad675eb50d6ebb7
-  data.tar.gz: 3bb3edb2068ea51e0e24933e7de96637241d7b1a83b1766c3ed8ba6dd5801b6ee072df2acddbabca53cb965880a247e9cc2e8d42b5526d1c3394d5acfd942d0e
+  metadata.gz: 2f259d810f0986bdccfc9816662f69e7168ac5ba17449a2d677f3b254fbf2570d380eb1725ac25faeaca20a02e2c0566aa843f4585de83f6f3bec191c235c094
+  data.tar.gz: bd31fe6cdd7afb5bfb6c8c68026cafc0d4f7c440e42d3a2839eadd92eef00c7899714efa2b85a84e789ddcf2ea6fa6473a12eb0f5cd854b350f4b8fd2a39bf0e

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

@@ -4,13 +4,13 @@ module Decidim
   module Elections
     module Admin
       class CreateElection < Decidim::Commands::CreateResource
-        include ::Decidim::GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
 
         fetch_form_attributes :title, :description, :start_at, :end_at, :results_availability
 
         protected
 
-        attr_reader :gallery
+        attr_reader :attachments
 
         def resource_class = Decidim::Elections::Election
 
@@ -34,14 +34,14 @@ module Decidim
 
         def run_after_hooks
           @attached_to = resource
-          create_gallery if process_gallery?
+          create_attachments if process_attachments?
         end
 
         def run_before_hooks
-          return unless process_gallery?
+          return unless process_attachments?
 
-          build_gallery
-          raise Decidim::Commands::HookError if gallery_invalid?
+          build_attachments
+          raise Decidim::Commands::HookError if attachments_invalid?
         end
       end
     end

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

@@ -4,7 +4,7 @@ module Decidim
   module Elections
     module Admin
       class UpdateElection < Decidim::Commands::UpdateResource
-        include ::Decidim::GalleryMethods
+        include ::Decidim::MultipleAttachmentsMethods
 
         fetch_form_attributes :title, :description, :start_at, :end_at, :results_availability
 
@@ -44,15 +44,15 @@ module Decidim
         end
 
         def run_after_hooks
-          create_gallery if process_gallery?
-          photo_cleanup!
+          create_attachments if process_attachments?
+          attachment_cleanup!(include_all_attachments: true)
         end
 
         def run_before_hooks
-          return unless process_gallery?
+          return unless process_attachments?
 
-          build_gallery
-          raise Decidim::Commands::HookError if gallery_invalid?
+          build_attachments
+          raise Decidim::Commands::HookError if attachments_invalid?
         end
       end
     end

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

@@ -20,12 +20,12 @@ module Decidim
         attribute :results_availability, String, default: "after_end"
         attribute :attachment, AttachmentForm
 
-        attachments_attribute :photos
+        attachments_attribute :attachments
 
         validates :title, translatable_presence: true
         validates :results_availability, inclusion: { in: Decidim::Elections::Election::RESULTS_AVAILABILITY_OPTIONS }
         validates :start_at, date: { before: :end_at }, unless: :manual_start?
-        validates :start_at, date: { after: proc { Time.current } }, if: :scheduled_election?
+        validates :start_at, date: { after: proc { Time.current } }, if: ->(f) { f.election&.scheduled? && f.start_at.present? }
         validates :manual_start, acceptance: true, if: :per_question_not_started?
         validates :end_at, presence: true
         validates :end_at, date: { after: :start_at }, if: ->(f) { f.start_at.present? && f.end_at.present? }
@@ -33,6 +33,8 @@ module Decidim
 
         def map_model(election)
           self.manual_start = election.start_at.blank?
+          self.attachments = election.attachments.ids
+          self.add_attachments = election.attachments.map { |att| { id: att.id, title: att.title } }
         end
 
         def results_availability_labels

data/app/helpers/decidim/elections/application_helper.rb

@@ -52,12 +52,7 @@ module Decidim
         description = translated_attribute(question.description)
         return if description.blank?
 
-        sanitized = decidim_sanitize_admin(description)
-        if rich_text_editor_in_public_views?
-          Decidim::ContentProcessor.render_without_format(sanitized).html_safe
-        else
-          Decidim::ContentProcessor.render(sanitized, "div")
-        end
+        decidim_sanitize_editor_admin(description)
       end
 
       def selected_response_option_id(question)

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

@@ -42,7 +42,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.edit_elections_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.edit_elections_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "pencil-line", class: "text-gray" %>
               <span>
                 <%= t("actions.edit", scope: "decidim.elections") %>
@@ -77,7 +77,7 @@
       <% else %>
         <li class="dropdown__item">
           <div class="dropdown__button-disabled">
-            <%= with_tooltip t("tooltips.deleted_elections_info", scope: "decidim.admin") do %>
+            <%= with_tooltip t("tooltips.deleted_elections_info", scope: "decidim.admin"), class: :left do %>
               <%= icon "delete-bin-line", class: "text-gray" %>
               <span>
                 <%= t("actions.soft_delete", scope: "decidim.admin") %>

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

@@ -21,7 +21,7 @@
         </div>
 
         <div class="row column">
-          <%= form.attachment :photos,
+          <%= form.attachment :attachments,
                               multiple: true,
                               label: false,
                               button_label: t("decidim.elections.admin.elections.form.add_images"),

data/app/views/decidim/elections/elections/_questions.html.erb

@@ -12,7 +12,10 @@
       </button>
     </div>
     <div id="panel-question-<%= question.id %>" class="card-accordion-section" aria-hidden="true">
-      <div class="mb-4"><%= decidim_sanitize translated_attribute(question.description) %></div>
+       <% description = render_question_description(question) %>
+       <% if description.present? %>
+         <div class="editor-content"><%= description %></div>
+       <% end %>
 
         <% question.response_options.each do |answer| %>
           <h4><%= translated_attribute answer.body %></h4>

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

@@ -12,7 +12,7 @@
   </head>
   <body class="text-black text-md form-defaults<%= yield (:body_class) %>">
   <div class="layout-container">
-    <header>
+    <header role="banner">
       <div id="elections-header-container">
         <%= render partial: "layouts/decidim/election_votes_header" %>
       </div>
@@ -22,7 +22,7 @@
         <%= display_flash_messages %>
       </div>
     <% end %>
-    <main class="layout-1col cols-6">
+    <main class="layout-1col cols-6" role="main">
       <div class="py-8 space-y-8 lg:py-12 lg:space-y-12">
         <%= yield %>
       </div>

data/config/locales/cs.yml

@@ -145,9 +145,18 @@ cs:
             form_description: Otázka musí mít alespoň dvě odpovědi, aby mohla jít k dalšímu kroku.
           update:
             invalid: Při aktualizaci otázek došlo k chybě.
+            success: Otázky byly úspěšně aktualizovány.
         statuses:
+          enable_voting:
+            invalid: Při povolování hlasování došlo k chybě.
+            success: Hlasování bylo úspěšně aktivováno.
+          end:
+            invalid: Vyskytl se problém s ukončením voleb.
           publish_results:
             invalid: Při publikování výsledků došlo k chybě.
+            success: Výsledky byly úspěšně zveřejněny.
+          start:
+            invalid: Vyskytl se problém při zahájení voleb.
           unknown: Neznámý stav
       admin_log:
         election:

data/config/locales/eu.yml

@@ -44,7 +44,7 @@ eu:
         new: Beste hauteskunde bat
         preview: Aurrebistaratu
         title: Ekintzak
-        view: Hauteskundeak ikusi
+        view: Ikusi hauteskundeak
         view_deleted_elections: Ikusi ezabatutako hauteskundeak
       admin:
         census:
@@ -195,11 +195,11 @@ eu:
           update: "%{user_name} parte-hartzaileak eguneratu ditu %{resource_name} aukerako galderak"
       census_checks:
         show:
-          description: Behin hauteskundeak hasita, bertan bozkatu ahal izango da.
-          exit_button: Exit the census check
-          title: Behar bezala egiaztatu da
+          description: Honek esan nahi du behin bozketak hasita, bertan eman ahal duzula botoa.
+          exit_button: Irten errolda egiaztatzetik
+          title: Behar bezala egiaztatu zaituzte
       censuses:
-        census_ready_html: Erroldako datuak kargatuta daude eta prest daude % <b>%{election_title}{@eleccion_title}</b> bozketan erabiltzeko.
+        census_ready_html: Erroldako datuak kargatuta eta prest daude % <b>{eleccion_title}</b> bozketan erabiltzeko.
         census_size_html:
           one: Gaur egun <strong>bat</strong> pertsona dago hautesleku honetan botoa jasotzeko gai dena (hau errolda dinamiko batean alda daiteke).
           other: Gaur egun <strong>bat</strong> pertsona daude hautesleku honetan botoa jasotzeko gai deirnak (hau errolda dinamiko batean alda daiteke).
@@ -221,7 +221,7 @@ eu:
           verify_with_method: Egiaztatu %{name} izenaz
         token_csv:
           example: |
-            e-maila: 
+            e-maila:
             user@example.org;123456
             user2@example.org;ABCXYZ
           info_html: |
@@ -268,7 +268,7 @@ eu:
           vote_button: Eman babesa
           voted: Bozkatu duzu. Berriz bozkatu dezakezu, zure azken botoa baino ez da kontuan hartuko.
           votes_count:
-            one: 1 boto
+            one: Boto 1
             other: "%{count} boto"
           voting_began: 'Bozketa hasi zen: %{start_date}'
         vote_results:
@@ -293,7 +293,7 @@ eu:
         waiting:
           description: Hemen itxaron dezakezu hurrengo galdera egin arte. Automatikoki hurrengo galderara itzuliko zara prest dagoenean.
           edit_vote: Zure botoa editau
-          exit_button: Itxarongelatik irten
+          exit_button: Irten itxarongelatik
           title: Hurrengo galderaren zain
       status:
         active: Aktibo
@@ -329,7 +329,7 @@ eu:
           next: Hurrengoa
         receipt:
           description: Bozkatzeko epea zabalik dagoen bitartean edozein unetan eman daiteke berriro botoa. Zure aurreko botoa berriaz gainidatziko da.
-          edit_vote: Zure botoa editau
+          edit_vote: Editatu zure botoa
           exit_button: Irten bozkatzeko kabinatik
           title: Zure botoak zuzen eman dira
     metadata:

data/decidim-elections.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.0.rc2"
+  version = "0.32.0"
   s.version = version
   s.authors = ["Ivan Vergés"]
   s.email = ["ivan@pokecode.net"]

data/lib/decidim/elections/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Elections
     def self.version
-      "0.32.0.rc2"
+      "0.32.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-elections
 version: !ruby/object:Gem::Version
-  version: 0.32.0.rc2
+  version: 0.32.0
 platform: ruby
 authors:
 - Ivan Vergés
@@ -15,84 +15,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.0.rc2
+        version: 0.32.0
 description: A module that aims to provide a set of tools to create elections in Decidim.
 email:
 - ivan@pokecode.net