decidim-initiatives 0.28.3 → 0.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad25a695437706aa88211478857b393a4c4505d04036405d36977d6abc49bc0
-  data.tar.gz: a5f40a96808072790753cf430c42de1b3257f6835d063227ffc7a505f494b631
+  metadata.gz: 385f59fc013f222a12e84ea61d1d07e2b89e35ddd948e9c2c296fca9d451a94e
+  data.tar.gz: 18a6a641473cb761c30337e9fe87c9995fd55e94b6db0d7127dac6021ae8da4a
 SHA512:
-  metadata.gz: 7b8dc0d241862f8e8968be4a9c990161ce6546c64b05e9162376bdb96f0ca1ce67c0fe0f2e39524b2a4d3397cab0c6abdcb7c30869276a71c5708122e9201af5
-  data.tar.gz: 879470ed3675204fed4710bbcdab54951bda3624a52d0d7d3208b8182e7a1f4609ef2a135c088fce70a5a8242dcfb3facb162bd876a55688aaf2f056d7048c8b
+  metadata.gz: cc8356303d54a4f5ba5d8b48a388a1cd56ffdf337cbac9f8e577e79b6b676b9edaf0d9862f5deb3c0e8f0aeb4ba87a8dfbae75104df9eaaf6573f3783e2db600
+  data.tar.gz: 86dc4362c15cd2e458c19cf11f36d2a56e00346a30360ef7bab24ddc980400da4f1cf248345714d27ee95fc3306017522a9f8d5a88ccba80a4a4ee7dc4171948

data/app/commands/decidim/initiatives/approve_membership_request.rb

@@ -32,7 +32,7 @@ module Decidim
           resource: @membership_request.initiative,
           affected_users: [@membership_request.user],
           force_send: true,
-          extra: { author: @membership_request.initiative.author }
+          extra: { author: { id: @membership_request.initiative.author&.id } }
         )
       end
     end

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -87,7 +87,7 @@ module Decidim
       end
 
       def scoped_type
-        InitiativesTypeScope.order(:id).find_by(type: form.type)
+        InitiativesTypeScope.order(:id).find_by(type: form.type, scope: form.scope)
       end
 
       def signature_end_date

data/app/commands/decidim/initiatives/revoke_membership_request.rb

@@ -32,7 +32,7 @@ module Decidim
           resource: @membership_request.initiative,
           affected_users: [@membership_request.user],
           force_send: true,
-          extra: { author: @membership_request.initiative.author }
+          extra: { author: { id: @membership_request.initiative.author&.id } }
         )
       end
     end

data/app/commands/decidim/initiatives/spawn_committee_request.rb

@@ -58,7 +58,7 @@ module Decidim
           resource: initiative,
           affected_users: [initiative.author],
           force_send: true,
-          extra: { applicant: current_user }
+          extra: { applicant: { id: current_user&.id } }
         )
       end
 

data/app/controllers/decidim/initiatives/admin/initiatives_controller.rb

@@ -65,6 +65,7 @@ module Decidim
 
           PublishInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.publish.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -76,6 +77,7 @@ module Decidim
 
           UnpublishInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.unpublish.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -86,6 +88,7 @@ module Decidim
           enforce_permission_to :discard, :initiative, initiative: current_initiative
           DiscardInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.discard.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -96,6 +99,7 @@ module Decidim
           enforce_permission_to :accept, :initiative, initiative: current_initiative
           AcceptInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.accept.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end
@@ -106,6 +110,7 @@ module Decidim
           enforce_permission_to :reject, :initiative, initiative: current_initiative
           RejectInitiative.call(current_initiative, current_user) do
             on(:ok) do
+              flash[:notice] = I18n.t("initiatives.reject.success", scope: "decidim.initiatives.admin")
               redirect_to decidim_admin_initiatives.edit_initiative_path(current_initiative)
             end
           end

data/app/controllers/decidim/initiatives/committee_requests_controller.rb

@@ -20,6 +20,7 @@ module Decidim
 
         form = Decidim::Initiatives::CommitteeMemberForm
                .from_params(initiative_id: current_initiative.id, user_id: current_user.id, state: "requested")
+               .with_context(current_organization: current_initiative.organization, current_user:)
 
         SpawnCommitteeRequest.call(form, current_user) do
           on(:ok) do

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -107,7 +107,7 @@ module Decidim
       end
 
       def print
-        enforce_permission_to :read, :initiative, initiative: current_initiative
+        enforce_permission_to :print, :initiative, initiative: current_initiative
       end
 
       private

data/app/forms/decidim/initiatives/admin/initiative_answer_form.rb

@@ -10,7 +10,7 @@ module Decidim
 
         mimic :initiative
 
-        translatable_attribute :answer, String
+        translatable_attribute :answer, Decidim::Attributes::RichText
         attribute :answer_url, String
         attribute :signature_start_date, Decidim::Attributes::LocalizedDate
         attribute :signature_end_date, Decidim::Attributes::LocalizedDate

data/app/forms/decidim/initiatives/admin/initiative_form.rb

@@ -11,7 +11,7 @@ module Decidim
         mimic :initiative
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :type_id, Integer
         attribute :decidim_scope_id, Integer
         attribute :area_id, Integer

data/app/forms/decidim/initiatives/admin/initiative_type_form.rb

@@ -12,7 +12,7 @@ module Decidim
         mimic :initiatives_type
 
         translatable_attribute :title, String
-        translatable_attribute :description, String
+        translatable_attribute :description, Decidim::Attributes::RichText
         attribute :banner_image
         attribute :signature_type, String
         attribute :undo_online_signatures_enabled, Boolean
@@ -25,7 +25,7 @@ module Decidim
         attribute :promoting_committee_enabled, Boolean
         attribute :minimum_committee_members, Integer
         attribute :collect_user_extra_fields, Boolean
-        translatable_attribute :extra_fields_legal_information, String
+        translatable_attribute :extra_fields_legal_information, Decidim::Attributes::RichText
         attribute :validate_sms_code_on_votes, Boolean
         attribute :document_number_authorization_handler, String
 

data/app/packs/entrypoints/decidim_initiatives_admin.js

@@ -1,3 +1,5 @@
 import "src/decidim/initiatives/admin/initiatives_types"
 import "src/decidim/initiatives/admin/invite_users"
 import "src/decidim/initiatives/scoped_type"
+
+import "entrypoints/decidim_initiatives_admin.scss"

data/app/packs/entrypoints/decidim_initiatives_admin.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/initiatives/admin/initiatives.scss";

data/app/packs/stylesheets/decidim/initiatives/admin/initiatives.scss

@@ -0,0 +1,13 @@
+#committee_members {
+  .card-section {
+    .row {
+      div[data-committee_link] {
+        @apply flex items-center;
+
+        svg {
+          @apply mx-1;
+        }
+      }
+    }
+  }
+}

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

@@ -134,8 +134,8 @@ module Decidim
           return unless permission_action.subject == :initiative
 
           case permission_action.action
-          when :read
-            toggle_allow(Decidim::Initiatives.print_enabled)
+          when :print
+            toggle_allow(Decidim::Initiatives.print_enabled && user.admin?)
           when :publish, :discard
             toggle_allow(initiative.validating?)
           when :unpublish

data/app/permissions/decidim/initiatives/permissions.rb

@@ -4,6 +4,8 @@ module Decidim
   module Initiatives
     class Permissions < Decidim::DefaultPermissions
       def permissions
+        return permission_action if initiative && !initiative.is_a?(Decidim::Initiative)
+
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Initiatives::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
@@ -19,6 +21,7 @@ module Decidim
         create_initiative?
         edit_public_initiative?
         update_public_initiative?
+        print_initiative?
 
         vote_initiative?
         sign_initiative?
@@ -121,6 +124,17 @@ module Decidim
         )
       end
 
+      def print_initiative?
+        return unless permission_action.action == :print &&
+                      permission_action.subject == :initiative
+
+        toggle_allow(Decidim::Initiatives.print_enabled && (authorship_or_admin? || committee_member?))
+      end
+
+      def committee_member?
+        InitiativesPromoted.by(user).exists?(id: initiative.id)
+      end
+
       def vote_initiative?
         return unless permission_action.action == :vote &&
                       permission_action.subject == :initiative

data/app/views/decidim/initiatives/admin/committee_requests/index.html.erb

@@ -56,4 +56,5 @@
   </table>
 </div>
 
+<%= append_stylesheet_pack_tag "decidim_initiatives_admin" %>
 <%= append_javascript_pack_tag "decidim_initiatives_admin" %>

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

@@ -55,16 +55,16 @@
               <%= icon "chat-1-line", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
             <% end %>
 
-            <% if allowed_to? :read, :initiative, initiative: initiative %>
-              <%= icon_link_to "printer-line",
-                               decidim_initiatives.print_initiative_path(initiative),
-                               t(".print"),
-                               class: "action-icon--print",
-                               target: "_blank",
-                               data: { "external-link": false } %>
-            <% else %>
-              <span class="action-space icon"></span>
-            <% end %>
+              <% if allowed_to? :print, :initiative, initiative: initiative %>
+                <%= icon_link_to "printer-line",
+                                 decidim_initiatives.print_initiative_path(initiative),
+                                 t(".print"),
+                                 class: "action-icon--print",
+                                 target: "_blank",
+                                 data: { "external-link": false } %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
 
             <% if allowed_to? :preview, :initiative, initiative: initiative %>
               <%= icon_link_to "eye-line",

data/config/initializers/wicked_pdf.rb

@@ -14,8 +14,6 @@ WickedPdf.config = {
   # Path to the wkhtmltopdf executable: This usually is not needed if using
   # one of the wkhtmltopdf-binary family of gems.
   # exe_path: '/usr/local/bin/wkhtmltopdf',
-  #   or
-  exe_path: Gem.bin_path("wkhtmltopdf-binary", "wkhtmltopdf")
 
   # Layout file to be used for all PDFs
   # (but can be overridden in `render :pdf` calls)

data/config/locales/ar.yml

@@ -97,6 +97,7 @@ ar:
             initiative_title: عنوان المبادرة
             name_and_surname: اسم ولقب
             postal_code: الكود البريدى
+            scope: نطاق
             time_and_date: الوقت و التاريخ
             timestamp: الطابع الزمني
       titles:
@@ -314,6 +315,7 @@ ar:
           full_name: الاسم الكامل
           initiative:
             description: 'الوصف:'
+          print: طباعة
         result:
           initiative_rejected_reason: تم رفض هذه المبادرة بسبب افتقارها للتوقيعات.
         signatures_count:
@@ -359,8 +361,12 @@ ar:
     menu:
       initiatives: المبادرات
     resources:
+      initiative:
+        actions:
+          comment: تعليق
       initiatives_type:
         actions:
+          create: إنشاء
           title: أفعال
           vote: إشارة
   layouts:

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1 @@
+bs:

data/config/locales/ca.yml

@@ -113,7 +113,7 @@ ca:
           see_initiative: Veure la iniciativa
         initiatives_settings: Configuració
         initiatives_submenu:
-          info: Sobre aquesta iniciativa
+          info: Quant a aquesta iniciativa
         initiatives_types: Tipus d'iniciatives
         moderations: Moderacions
       models:
@@ -238,6 +238,10 @@ ca:
         exports:
           initiatives: Iniciatives
         initiatives:
+          accept:
+            success: La iniciativa s'ha acceptat correctament.
+          discard:
+            success: La iniciativa s'ha descartat correctament.
           edit:
             accept: Accepta la iniciativa
             confirm: Segur?
@@ -261,6 +265,12 @@ ca:
             edit: Edita
             new: Nou
             photos: Fotografies
+          publish:
+            success: La iniciativa s'ha publicat correctament.
+          reject:
+            success: La iniciativa s'ha rebutjat correctament.
+          unpublish:
+            success: La iniciativa s'ha despublicat correctament.
           update:
             error: S'ha produït un error.
             success: La iniciativa s'ha actualitzat correctament.
@@ -521,7 +531,7 @@ ca:
           section: 'Si l''organització ho demana, imprimeix i omple aquest formulari per presentar-lo quan s''indiqui:'
           signature: Signatura
         result:
-          answer_title: S'ha respost aquesta iniciativa.
+          answer_title: S'ha respost aquesta iniciativa
           initiative_rejected_reason: Aquesta iniciativa ha estat rebutjada per falta de signatures.
         show:
           area: Àrea

data/config/locales/cs.yml

@@ -153,7 +153,7 @@ cs:
             initiative_title: Název iniciativy
             name_and_surname: Jméno a příjmení
             postal_code: Poštovní směrovací číslo
-            scope: Oblast působnosti
+            scope: Rozsah
             time_and_date: Čas a datum
             timestamp: Časové razítko
       titles:
@@ -244,6 +244,10 @@ cs:
         exports:
           initiatives: Iniciativy
         initiatives:
+          accept:
+            success: Iniciativa byla úspěšně přijata.
+          discard:
+            success: Iniciativa byla úspěšně zrušena.
           edit:
             accept: Přijmout iniciativu
             confirm: Jste si jisti?
@@ -267,6 +271,12 @@ cs:
             edit: Upravit
             new: Nový
             photos: Fotky
+          publish:
+            success: Iniciativa byla úspěšně publikována.
+          reject:
+            success: Iniciativa byla úspěšně zamítnuta.
+          unpublish:
+            success: Iniciativa byla úspěšně zneveřejněna.
           update:
             error: Došlo k chybě.
             success: Tato iniciativa byla úspěšně aktualizována.

data/config/locales/de.yml

@@ -223,7 +223,7 @@ de:
         committee_requests:
           index:
             approve: Genehmigen
-            confirm_revoke: Sind Sie sicher?
+            confirm_revoke: Sind Sie sich sicher?
             invite_to_committee_help: Teilen Sie diesen Link, um andere Teilnehmer zum Unterstützungskomitee einzuladen.
             no_members_yet: Es gibt keine Mitglieder im Unterstützungskomitee.
             revoke: Widerrufen
@@ -238,6 +238,10 @@ de:
         exports:
           initiatives: Initiativen
         initiatives:
+          accept:
+            success: Die Initiative wurde erfolgreich akzeptiert.
+          discard:
+            success: Die Initiative wurde erfolgreich gelöscht.
           edit:
             accept: Initiative akzeptieren
             confirm: Sind Sie sich sicher?
@@ -261,6 +265,12 @@ de:
             edit: Bearbeiten
             new: Neu
             photos: Fotos
+          publish:
+            success: Die Initiative wurde erfolgreich veröffentlicht.
+          reject:
+            success: Die Initiative wurde erfolgreich zurückgewiesen.
+          unpublish:
+            success: Die Veröffentlichung der Initiative wurde erfolgreich zurückgezogen.
           update:
             error: Ein Fehler ist aufgetreten.
             success: Die Initiative wurde erfolgreich aktualisiert.

data/config/locales/el.yml

@@ -99,6 +99,7 @@ el:
             initiative_title: Τίτλος πρωτοβουλίας
             name_and_surname: Όνομα και επώνυμο
             postal_code: Ταχυδρομικός κώδικας
+            scope: Πεδίο εφαρμογής
             time_and_date: Ώρα και ημερομηνία
             timestamp: Χρονική σήμανση
       titles:
@@ -324,6 +325,7 @@ el:
           recently_published: Δημοσιεύτηκαν πιο πρόσφατα
         print:
           city: Πόλη
+          print: Εκτύπωση
         result:
           initiative_rejected_reason: Αυτή η πρωτοβουλία απορρίφθηκε λόγω της έλλειψης υπογραφών.
         signatures_count:
@@ -367,6 +369,7 @@ el:
     resources:
       initiatives_type:
         actions:
+          create: Δημιουργία
           title: Ενέργειες
           vote: Υπογραφή
   layouts:

data/config/locales/en.yml

@@ -238,6 +238,10 @@ en:
         exports:
           initiatives: Initiatives
         initiatives:
+          accept:
+            success: The initiative has been successfully accepted.
+          discard:
+            success: The initiative has been successfully discarded.
           edit:
             accept: Accept initiative
             confirm: Are you sure?
@@ -261,6 +265,12 @@ en:
             edit: Edit
             new: New
             photos: Photos
+          publish:
+            success: The initiative has been successfully published.
+          reject:
+            success: The initiative has been successfully rejected.
+          unpublish:
+            success: The initiative has been successfully unpublished.
           update:
             error: An error has occurred.
             success: The initiative has been successfully updated.

data/config/locales/es-MX.yml

@@ -147,7 +147,7 @@ es-MX:
             initiative_title: Título de la iniciativa
             name_and_surname: Nombre y apellido
             postal_code: código postal
-            scope: Ámbito
+            scope: Alcance
             time_and_date: Hora y fecha
             timestamp: Marca de tiempo
       titles:
@@ -238,6 +238,10 @@ es-MX:
         exports:
           initiatives: Iniciativas
         initiatives:
+          accept:
+            success: La iniciativa se ha aceptado correctamente.
+          discard:
+            success: La iniciativa se ha descartado correctamente.
           edit:
             accept: Aceptar iniciativa
             confirm: '¿Estás seguro?'
@@ -261,6 +265,12 @@ es-MX:
             edit: Editar
             new: Nueva
             photos: Fotos
+          publish:
+            success: La iniciativa se ha publicado correctamente.
+          reject:
+            success: La iniciativa se ha rechazado correctamente.
+          unpublish:
+            success: La iniciativa se ha despublicado correctamente.
           update:
             error: Se ha producido un error.
             success: La iniciativa se ha actualizado correctamente.
@@ -516,7 +526,7 @@ es-MX:
           phone_number: Número de teléfono
           place_date: Lugar, fecha
           postal_code: Código postal
-          print: Imprimir
+          print: Impresión
           province: Provincia
           section: 'Si lo solicita la organización, por favor imprime y rellena este formulario para enviar donde se indique:'
           signature: Firma

data/config/locales/es-PY.yml

@@ -147,7 +147,7 @@ es-PY:
             initiative_title: Título de la iniciativa
             name_and_surname: Nombre y apellido
             postal_code: código postal
-            scope: Ámbito
+            scope: Alcance
             time_and_date: Hora y fecha
             timestamp: Marca de tiempo
       titles:
@@ -238,6 +238,10 @@ es-PY:
         exports:
           initiatives: Iniciativas
         initiatives:
+          accept:
+            success: La iniciativa se ha aceptado correctamente.
+          discard:
+            success: La iniciativa se ha descartado correctamente.
           edit:
             accept: Aceptar iniciativa
             confirm: '¿Estás seguro?'
@@ -261,6 +265,12 @@ es-PY:
             edit: Editar
             new: Nueva
             photos: Fotos
+          publish:
+            success: La iniciativa se ha publicado correctamente.
+          reject:
+            success: La iniciativa se ha rechazado correctamente.
+          unpublish:
+            success: La iniciativa se ha despublicado correctamente.
           update:
             error: Se ha producido un error.
             success: La iniciativa se ha actualizado correctamente.
@@ -516,7 +526,7 @@ es-PY:
           phone_number: Número de teléfono
           place_date: Lugar, fecha
           postal_code: Código postal
-          print: Imprimir
+          print: Impresión
           province: Provincia
           section: 'Si lo solicita la organización, por favor imprime y rellena este formulario para enviar donde se indique:'
           signature: Firma

data/config/locales/es.yml

@@ -238,6 +238,10 @@ es:
         exports:
           initiatives: Iniciativas
         initiatives:
+          accept:
+            success: La iniciativa se ha aceptado correctamente.
+          discard:
+            success: La iniciativa se ha descartado correctamente.
           edit:
             accept: Aceptar iniciativa
             confirm: '¿Estás seguro?'
@@ -261,6 +265,12 @@ es:
             edit: Editar
             new: Nueva
             photos: Fotos
+          publish:
+            success: La iniciativa se ha publicado correctamente.
+          reject:
+            success: La iniciativa se ha rechazado correctamente.
+          unpublish:
+            success: La iniciativa se ha despublicado correctamente.
           update:
             error: Se ha producido un error.
             success: La iniciativa se ha actualizado correctamente.
@@ -521,7 +531,7 @@ es:
           section: 'Si lo solicita la organización, por favor imprime y rellena este formulario para enviar donde se indique:'
           signature: Firma
         result:
-          answer_title: Se ha respondido a esta iniciativa.
+          answer_title: Se ha respondido a esta iniciativa
           initiative_rejected_reason: Esta iniciativa ha sido rechazada debido a la falta de firmas.
         show:
           area: Área