decidim-forms 0.26.2 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c05c5c0a4333cc4dbefaa5e8d37fa861059a6881d5d47d075fd618e7f7169826
-  data.tar.gz: f46c7ea6704161d57385dd589360b78fe3763057e532640004cbb539aee5c0e4
+  metadata.gz: 81e96451d62f5103d06d5e3faed9995dd4095fd26ead4b0e46441b480248a1cb
+  data.tar.gz: f764c1a304b7a2fd98a716595b51b79342afa092b812dc3b2d627535b6199a43
 SHA512:
-  metadata.gz: fb39a317c541eca9a1d3ed286b8b3873a79bc7f748a37ae4a20a693e19900b473b6e83f46ec82d07c3d5d5b603143d5d46327addfd19d99f014f163f8a741775
-  data.tar.gz: 593ac4089260f909886fa7b05de438d2da561a4d5801742044c79a7c2ee5343c1c59df55282c8fd18af036ce272fc04329c3ef9bb04699de5cf5182dd361ed36
+  metadata.gz: 22a006a8033a94f5d9791c74300cc298505521746a40452ae6f10742e6f2da2100cb1f2e4d1c9b6b229908a3e29bce816f338311db14e8581ff8278218298f22
+  data.tar.gz: 6eac52cf9bac996ce47017745444527615c5ba099234d4c7efc1586d93fb8603860158644773526ac9215e9ded8cc0f941b0ec731bc62a755ceddbb97ee5f4cb

data/app/commands/decidim/forms/admin/update_questionnaire.rb

@@ -5,14 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Questionnaire from the admin
       # panel.
-      class UpdateQuestionnaire < Rectify::Command
+      class UpdateQuestionnaire < Decidim::Command
         # Initializes a UpdateQuestionnaire Command.
         #
         # form - The form from which to get the data.
         # questionnaire - The current instance of the questionnaire to be updated.
-        def initialize(form, questionnaire)
+        def initialize(form, questionnaire, user)
           @form = form
           @questionnaire = questionnaire
+          @user = user
         end
 
         # Updates the questionnaire if valid.
@@ -21,13 +22,17 @@ module Decidim
         def call
           return broadcast(:invalid) if @form.invalid?
 
-          Decidim::Forms::Questionnaire.transaction do
-            if @questionnaire.questions_editable?
-              update_questionnaire_questions
-              delete_answers unless @questionnaire.published?
-            end
+          Decidim.traceability.perform_action!("update",
+                                               @questionnaire,
+                                               @user) do
+            Decidim::Forms::Questionnaire.transaction do
+              if @questionnaire.questions_editable?
+                update_questionnaire_questions
+                delete_answers unless @questionnaire.published?
+              end
 
-            update_questionnaire
+              update_questionnaire
+            end
           end
 
           broadcast(:ok)

data/app/commands/decidim/forms/answer_questionnaire.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # This command is executed when the user answers a Questionnaire.
-    class AnswerQuestionnaire < Rectify::Command
+    class AnswerQuestionnaire < Decidim::Command
       include ::Decidim::MultipleAttachmentsMethods
 
       # Initializes a AnswerQuestionnaire Command.
@@ -43,7 +43,7 @@ module Decidim
       # of this problem.
       def reset_form_attachments
         @form.responses.each do |answer|
-          answer.errors.add(:add_documents, :needs_to_be_reattached) if answer.has_attachments?
+          answer.errors.add(:add_documents, :needs_to_be_reattached) if answer.has_attachments? || answer.has_error_in_attachments?
         end
       end
 
@@ -51,7 +51,7 @@ module Decidim
         @main_form = @form
         @errors = nil
 
-        Answer.transaction do
+        Answer.transaction(requires_new: true) do
           form.responses_by_step.flatten.select(&:display_conditions_fulfilled?).each do |form_answer|
             answer = Answer.new(
               user: @current_user,

data/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb

@@ -22,7 +22,7 @@ module Decidim
 
             if defined? Decidim::Templates::Admin
               include Decidim::Templates::Admin::Concerns::Templatable
-              helper Decidim::Templates::Admin::TemplatesHelper
+              helper Decidim::DatalistSelectHelper
 
               def templatable_type
                 "Decidim::Forms::Questionnaire"
@@ -47,7 +47,7 @@ module Decidim
               params["published_at"] = Time.current if params.has_key? "save_and_publish"
               @form = form(Admin::QuestionnaireForm).from_params(params)
 
-              Admin::UpdateQuestionnaire.call(@form, questionnaire) do
+              Admin::UpdateQuestionnaire.call(@form, questionnaire, current_user) do
                 on(:ok) do
                   # i18n-tasks-use t("decidim.forms.admin.questionnaires.update.success")
                   flash[:notice] = I18n.t("update.success", scope: i18n_flashes_scope)

data/app/forms/decidim/forms/admin/display_condition_form.rb

@@ -55,21 +55,21 @@ module Decidim
         #
         # Returns a Decidim::Forms::Question
         def question
-          @question ||= Question.find_by(id: @decidim_question_id)
+          @question ||= Question.find_by(id: decidim_question_id)
         end
 
         # Finds the Condition Question from the given decidim_condition_question_id
         #
         # Returns a Decidim::Forms::Question
         def condition_question
-          @condition_question ||= Question.find_by(id: @decidim_condition_question_id)
+          @condition_question ||= Question.find_by(id: decidim_condition_question_id)
         end
 
         # Finds the Answer Option from the given decidim_answer_option_id
         #
         # Returns a Decidim::Forms::AnswerOption
         def answer_option
-          @answer_option ||= AnswerOption.find_by(id: @decidim_answer_option_id)
+          @answer_option ||= AnswerOption.find_by(id: decidim_answer_option_id)
         end
 
         private

data/app/forms/decidim/forms/answer_form.rb

@@ -69,6 +69,10 @@ module Decidim
         question.has_attachments? && errors[:add_documents].empty? && add_documents.present?
       end
 
+      def has_error_in_attachments?
+        errors[:add_documents].present?
+      end
+
       private
 
       def mandatory_body?

data/app/models/decidim/forms/answer.rb

@@ -4,7 +4,7 @@ module Decidim
   module Forms
     # The data store for an Answer in the Decidim::Forms
     class Answer < Forms::ApplicationRecord
-      include Decidim::DataPortability
+      include Decidim::DownloadYourData
       include Decidim::NewsletterParticipant
       include Decidim::HasAttachments
 
@@ -29,7 +29,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Forms::DataPortabilityUserAnswersSerializer
+        Decidim::Forms::DownloadYourDataUserAnswersSerializer
       end
 
       def self.newsletter_participant_ids(component)

data/app/models/decidim/forms/display_condition.rb

@@ -33,7 +33,7 @@ module Decidim
         when "not_equal"
           answer_form.choices.pluck(:answer_option_id).exclude?(answer_option.id)
         when "match"
-          condition_value.values.reject(&:blank?).any? { |value| answer_form_matches?(answer_form, value) }
+          condition_value.values.compact_blank.any? { |value| answer_form_matches?(answer_form, value) }
         end
       end
 

data/app/models/decidim/forms/questionnaire.rb

@@ -7,6 +7,7 @@ module Decidim
       include Decidim::Templates::Templatable if defined? Decidim::Templates::Templatable
       include Decidim::Publicable
       include Decidim::TranslatableResource
+      include Decidim::Traceable
 
       translatable_fields :title, :description, :tos
       belongs_to :questionnaire_for, polymorphic: true
@@ -16,6 +17,8 @@ module Decidim
 
       after_initialize :set_default_salt
 
+      attr_accessor :questionnaire_template_id
+
       # Public: returns whether the questionnaire questions can be modified or not.
       def questions_editable?
         has_component = questionnaire_for.respond_to? :component
@@ -32,6 +35,10 @@ module Decidim
         created_at.to_i == updated_at.to_i && questions.empty?
       end
 
+      def self.log_presenter_class_for(_log)
+        Decidim::Forms::AdminLog::QuestionnairePresenter
+      end
+
       private
 
       # salt is used to generate secure hash in anonymous answers

data/app/packs/src/decidim/forms/admin/forms.js

@@ -11,6 +11,7 @@ import createSortList from "src/decidim/admin/sort_list.component"
 import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 import createQuillEditor from "src/decidim/editor"
+import initLanguageChangeSelect from "src/decidim/admin/choose_language"
 
 export default function createEditableForm() {
   const wrapperSelector = ".questionnaire-questions";
@@ -392,6 +393,8 @@ export default function createEditableForm() {
 
       autoLabelByPosition.run();
       autoButtonsByPosition.run();
+
+      initLanguageChangeSelect($field.find("select.language-change").toArray());
     },
     onRemoveField: ($field) => {
       autoLabelByPosition.run();

data/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb

@@ -6,10 +6,18 @@ module Decidim
       #
       # Presenter for questionnaire answer
       #
-      class QuestionnaireAnswerPresenter < Rectify::Presenter
+      class QuestionnaireAnswerPresenter < SimpleDelegator
+        delegate :content_tag, :safe_join, to: :view_context
+
         include Decidim::TranslatableAttributes
 
-        attribute :answer, Decidim::Forms::Answer
+        def answer
+          __getobj__.fetch(:answer)
+        end
+
+        def view_context
+          __getobj__.fetch(:view_context, ActionController::Base.new.view_context)
+        end
 
         def question
           translated_attribute(answer.question.body)

data/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb

@@ -6,8 +6,10 @@ module Decidim
       #
       # Presenter for questionnaire response
       #
-      class QuestionnaireParticipantPresenter < Rectify::Presenter
-        attribute :participant, Decidim::Forms::Answer
+      class QuestionnaireParticipantPresenter < SimpleDelegator
+        def participant
+          __getobj__.fetch(:participant)
+        end
 
         def session_token
           participant.session_token || "-"
@@ -28,7 +30,7 @@ module Decidim
         end
 
         def status
-          t(registered? ? "registered" : "unregistered", scope: "decidim.forms.user_answers_serializer")
+          I18n.t(registered? ? "registered" : "unregistered", scope: "decidim.forms.user_answers_serializer")
         end
 
         def answers

data/app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Forms::Questionnaire`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    QuestionnairePresenter.new(action_log, view_helpers).present
+      class QuestionnairePresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "update"
+            "decidim.forms.admin_log.questionnaire.#{action}"
+          else
+            super
+          end
+        end
+
+        def i18n_params
+          super.merge(
+            meeting_name: resource_presenter.try(:present)
+          )
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/forms/questionnaire_participant.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireParticipant < Rectify::Query
+    class QuestionnaireParticipant < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/queries/decidim/forms/questionnaire_participants.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireParticipants < Rectify::Query
+    class QuestionnaireParticipants < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/queries/decidim/forms/questionnaire_user_answers.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Forms
     # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Rectify::Query
+    class QuestionnaireUserAnswers < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object

data/app/views/decidim/forms/questionnaires/show.html.erb

@@ -5,7 +5,7 @@
 
 <% columns = allow_answers? && visitor_can_answer? && @form.responses.map(&:question).any?(&:matrix?) ? 9 : 6 %>
 
-<%= render partial: "decidim/shared/component_announcement" %>
+<%= render partial: "decidim/shared/component_announcement" if current_component.manifest_name == "surveys" %>
 
 <div class="row columns">
   <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>
@@ -151,4 +151,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_forms" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_forms" %>
+<% end %>

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes:

data/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ ca:
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Formulari desat correctament.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} ha actualitzat el qüestionari %{resource_name}"
       errors:
         answer:
           body: El camp no pot estar en blanc
@@ -128,10 +132,9 @@ ca:
         extension_allowlist: 'Formats d''arxiu acceptats:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Aquesta imatge medirà:'
         processors:
-          resize_and_pad: Redimensionat i ajustat a
-          resize_to_fit: Redimensionada per ajustar-la
+          resize_and_pad: Aquesta imatge serà redimensionada i ajustada a %{dimensions}.
+          resize_to_fit: Aquesta imatge serà redimensionada per ajustar-se a %{dimensions}.
       question_types:
         files: Arxius
         long_answer: Resposta llarga

data/config/locales/cs.yml

@@ -1,3 +1,4 @@
+---
 cs:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ cs:
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} aktualizoval dotazník %{resource_name}"
       errors:
         answer:
           body: Tělo nemůže být prázdné
@@ -128,10 +132,9 @@ cs:
         extension_allowlist: 'Akceptované formáty:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Tento obrázek bude:'
         processors:
-          resize_and_pad: Zmenšeno a odsazeno k
-          resize_to_fit: Upravena velikost na vyplnění
+          resize_and_pad: Tento obrázek bude změněn a vyplněn na %{dimensions}.
+          resize_to_fit: Tento obrázek bude změněn a vyplněn na %{dimensions}.
       question_types:
         files: Soubory
         long_answer: Dlouhá odpověď

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ de:
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} hat die Umfrage %{resource_name} aktualisiert"
       errors:
         answer:
           body: Körper kann nicht leer sein
@@ -128,10 +132,9 @@ de:
         extension_allowlist: 'Gültige Formate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Das Bild wird:'
         processors:
-          resize_and_pad: in der Größe angepasst und gepolstert zu
-          resize_to_fit: in der Größe verändert, damit es passt
+          resize_and_pad: Dieses Bild wird skaliert und an %{dimensions} angepasst.
+          resize_to_fit: Dieses Bild wird auf %{dimensions} skaliert.
       question_types:
         files: Dateien
         long_answer: Lange Antwort

data/config/locales/el.yml

@@ -1,3 +1,4 @@
+---
 el:
   activemodel:
     attributes:
@@ -69,10 +70,6 @@ el:
         extension_allowlist: 'Αποδεκτές μορφές:'
       images:
         dimensions: "Π %{width} x Υ %{height} px"
-        dimensions_info: 'Για αυτήν την εικόνα θα:'
-        processors:
-          resize_and_pad: Αλλάξει το μέγεθος και θα συμπληρωθεί σε
-          resize_to_fit: Αλλάξει το μέγεθος για προσαρμογή
       question_types:
         long_answer: Μεγάλη απάντηση
         matrix_multiple: Πίνακας (πολλαπλή επιλογή)

data/config/locales/en.yml

@@ -122,6 +122,9 @@ en:
           update:
             invalid: There was a problem saving the form.
             success: Form successfully saved.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} updated the %{resource_name} questionnaire"
       errors:
         answer:
           body: Body can't be blank
@@ -129,10 +132,9 @@ en:
         extension_allowlist: 'Accepted formats:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'This image will be:'
         processors:
-          resize_and_pad: Resized and padded to
-          resize_to_fit: Resized to fit
+          resize_and_pad: This image will be resized and padded to %{dimensions}.
+          resize_to_fit: This image will be resized to fit %{dimensions}.
       question_types:
         files: Files
         long_answer: Long answer

data/config/locales/es-MX.yml

@@ -1,3 +1,4 @@
+---
 es-MX:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ es-MX:
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
@@ -128,10 +132,9 @@ es-MX:
         extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionado y ajustado a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga

data/config/locales/es-PY.yml

@@ -1,3 +1,4 @@
+---
 es-PY:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ es-PY:
           update:
             invalid: Ha habido errores al guardar el cuestionario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
@@ -128,10 +132,9 @@ es-PY:
         extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionado y ajustado a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga

data/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ es:
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} actualizó el cuestionario %{resource_name}"
       errors:
         answer:
           body: El campo no puede estar en blanco
@@ -128,10 +132,9 @@ es:
         extension_allowlist: 'Formatos de archivo aceptados:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagen medirá:'
         processors:
-          resize_and_pad: Redimensionada y ajustada a
-          resize_to_fit: Redimensionada para ajustarla
+          resize_and_pad: Esta imagen será redimensionada y ajustada a %{dimensions}.
+          resize_to_fit: Esta imagen será redimensionada para ajustarse a %{dimensions}.
       question_types:
         files: Archivos
         long_answer: Respuesta larga

data/config/locales/eu.yml

@@ -1,3 +1,4 @@
+---
 eu:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ eu:
         extension_allowlist: 'Onartutako formatuak:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Irudi honek neurtuko du:'
-        processors:
-          resize_and_pad: Birdimentsionatua eta honi egokitua
-          resize_to_fit: Birdimentsionatua egokitzeko
       question_types:
         files: Fitxategiak
         long_answer: Erantzun luzea

data/config/locales/fi-plain.yml

@@ -1,3 +1,4 @@
+---
 fi-pl:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ fi-pl:
           update:
             invalid: Kyselylomakkeiden tallentamisessa on tapahtunut virheitä.
             success: Lomake tallennettu onnistuneesti.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} päivitti kyselyä %{resource_name}"
       errors:
         answer:
           body: Runkoteksti ei voi olla tyhjä
@@ -128,10 +132,9 @@ fi-pl:
         extension_allowlist: 'Sallitut tiedostopäätteet:'
       images:
         dimensions: "%{width} x %{height} pikseliä"
-        dimensions_info: 'Tämän kuvan koko tulee olemaan:'
         processors:
-          resize_and_pad: Muutetaan kokoon ja täytetään
-          resize_to_fit: Muutetaan mahtumaan kokoon
+          resize_and_pad: Kuvan kokoa muutetaan ja rajataan arvoon %{dimensions}.
+          resize_to_fit: Tämä kuva muutetaan kokoon %{dimensions} sopivaksi.
       question_types:
         files: Tiedostot
         long_answer: Pitkä vastaus

data/config/locales/fi.yml

@@ -1,3 +1,4 @@
+---
 fi:
   activemodel:
     attributes:
@@ -121,6 +122,9 @@ fi:
           update:
             invalid: Kyselylomakkeen tallentaminen epäonnistui.
             success: Lomake tallennettu onnistuneesti.
+      admin_log:
+        questionnaire:
+          update: "%{user_name} päivitti kyselyä %{resource_name}"
       errors:
         answer:
           body: Runkoteksti ei voi olla tyhjä
@@ -128,10 +132,9 @@ fi:
         extension_allowlist: 'Sallitut tiedostopäätteet:'
       images:
         dimensions: "%{width} x %{height} pikseliä"
-        dimensions_info: 'Tämän kuvan koko tulee olemaan:'
         processors:
-          resize_and_pad: Muutetaan kokoon ja täytetään
-          resize_to_fit: Muutetaan mahtumaan kokoon
+          resize_and_pad: Kuvan kokoa muutetaan ja rajataan arvoon %{dimensions}.
+          resize_to_fit: Tämä kuva muutetaan kokoon %{dimensions} sopivaksi.
       question_types:
         files: Tiedostot
         long_answer: Pitkä vastaus