decidim-initiatives 0.29.0 → 0.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5617ea7d94769fefc1f52b4c0f4e5f1f4f19999e4c107af9f852a11c57c4b49d
-  data.tar.gz: 512eba6dd3fb881a4f685ea7af6806843ed69525a81d28f258acf7941a215b26
+  metadata.gz: d8aacccca0a9af81f8679c37857ac40b7a234f19389a985c2e9a93f59fad2e8d
+  data.tar.gz: d776e653fbbbaf9a998ecff7fa3de3ac3829f0d9ee7541f30de19fd4dd2839ed
 SHA512:
-  metadata.gz: f977269a9ba7d17b323c77e40e3781252b1f37eb9a80ef915b07ac35e01469786f3b7d71985431f39dee73ef5983bc14aa49645eca1147e9318671a00c67469e
-  data.tar.gz: 2ff7bbd691cfb2cb63a4aaff9a1b662ecf2c470ea2f3a49d770dec7ecfb858e3229cff859ebb330ec8dad08658e51d24db5349a3e2b56f9abd9990a8af26f41a
+  metadata.gz: 3e2f88c9f09a43805b7ecccc618702671c6d9797cbd4542014f921548180ded1b826c90b6f36e86ca54ad94c7cbfb18edcfe2c214772c775d978108d2666f5a3
+  data.tar.gz: 6a9fcf6b0c2f499cc282b7792ba8c962c313de903ef535283dea40f5c81454cb49b1999361a2f5bab41671267eee6eb9641f0e8972d3cdefd6091971e4e03541

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

@@ -86,7 +86,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

@@ -57,7 +57,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

@@ -67,6 +67,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
@@ -78,6 +79,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
@@ -88,6 +90,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
@@ -98,6 +101,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
@@ -108,6 +112,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) 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

@@ -60,7 +60,7 @@
                 <%= 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 %>
+              <% if allowed_to? :print, :initiative, initiative: initiative %>
                 <%= icon_link_to "printer-line",
                                  decidim_initiatives.print_initiative_path(initiative),
                                  t(".print"),

data/config/initializers/wicked_pdf.rb

@@ -15,7 +15,6 @@ WickedPdf.configure do |config|
   # one of the wkhtmltopdf-binary family of gems.
   #   or
   # config.exe_path = '/usr/local/bin/wkhtmltopdf',
-  config.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:
@@ -358,8 +360,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:
@@ -242,6 +242,10 @@ ca:
             alert_html: "<p>Has de crear com a mínim un tipus d'iniciativa per tal que les participants puguin començar a crear les seves iniciatives.</p><p>%{link}</p>"
             button: Nou tipus d'iniciativa
         initiatives:
+          accept:
+            success: La iniciativa s'ha acceptat correctament.
+          discard:
+            success: La iniciativa s'ha descartat correctament.
           edit:
             accept: Accepta la iniciativa
             confirm: Segur?
@@ -265,6 +269,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.
@@ -525,7 +535,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:
@@ -248,6 +248,10 @@ cs:
             alert_html: "<p>Musíte vytvořit alespoň jeden typ iniciativy, aby účastníci mohli začít vytvářet iniciativy.</p><p> %{link}</p>"
             button: Nový typ 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?
@@ -271,6 +275,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
@@ -242,6 +242,10 @@ de:
             alert_html: "<p>Sie müssen mindestens einen Initiativentyp erstellen, damit die Teilnehmenden Initiativen erstellen können.</p><p> %{link}</p>"
             button: Neuer Initiativentyp
         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?
@@ -265,6 +269,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:
@@ -366,6 +368,7 @@ el:
     resources:
       initiatives_type:
         actions:
+          create: Δημιουργία
           title: Ενέργειες
           vote: Υπογραφή
   layouts:

data/config/locales/en.yml

@@ -242,6 +242,10 @@ en:
             alert_html: "<p>You must create at least one initiative type so participants can start creating initiatives.</p><p> %{link}</p>"
             button: New initiative type
         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?
@@ -265,6 +269,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:
@@ -242,6 +242,10 @@ es-MX:
             alert_html: "<p>Tienes que crear por lo menos un tipo de iniciativa para que las participantes puedan empezar a crear sus iniciativas.</p><p>%{link}</p>"
             button: Nuevo tipo de iniciativa
         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?'
@@ -265,6 +269,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.
@@ -520,7 +530,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:
@@ -242,6 +242,10 @@ es-PY:
             alert_html: "<p>Tienes que crear por lo menos un tipo de iniciativa para que las participantes puedan empezar a crear sus iniciativas.</p><p>%{link}</p>"
             button: Nuevo tipo de iniciativa
         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?'
@@ -265,6 +269,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.
@@ -520,7 +530,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

@@ -242,6 +242,10 @@ es:
             alert_html: "<p>Tienes que crear por lo menos un tipo de iniciativa para que las participantes puedan empezar a crear sus iniciativas.</p><p>%{link}</p>"
             button: Nuevo tipo de iniciativa
         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?'
@@ -265,6 +269,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.
@@ -525,7 +535,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