decidim-forms 0.26.0 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '001966829dd7bb233641ea5fb6134eacfadb93b6e902854ea48ee21287a378af'
-  data.tar.gz: 10229cd3561629c46253977f603129863ac1d6cc87bd0737be5368ec22c6d9f2
+  metadata.gz: b63c51b898c731a6ac659b9160f4b5bf5d2404cea0aec58cb5fdffff1a29a9b0
+  data.tar.gz: e4a6cf68a62b0188511ba30c3fceda43c30a93bca8ab4a917edf608b8c531e1a
 SHA512:
-  metadata.gz: d5f1c63e9080a6599abbf681a66b58f937929d3d65401ce0d342c65ba8241b060f0fea8d1af1120296cabc3c287756adfd9310387de91028472ed2eff5893db5
-  data.tar.gz: b01e17fefc02e5d569eca30ac167c8d9d3eecd4edeaca8ed6b259b3aca7c6e73062bc7879da4b038e7c80a65d7237895a82c21d4c4b934041659444769915aa1
+  metadata.gz: 305a8eb86bf0c9d3afa0b861174ff41c79519b4f5aadd84975cccfdc9c2fd2fa2c12d1a14159a9b0da674d81233900802d271b38d078956ebd8bdd119287cbb4
+  data.tar.gz: ed601e91289f962ac5f647b205dafd86c61429e63b3401d210ccd0c345308bfcfc4f7ab5da761056b7335e66d0b2fe95c62ef4189a0dbf5e38b79d8e446ebab2

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/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/_answer.html.erb

@@ -30,7 +30,9 @@
 
   <%= answer_form.hidden_field :question_id %>
 
-  <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+  <% if answer.question.max_choices %>
+    <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+  <% end %>
 
   <% answer.errors.full_messages.each do |msg| %>
     <small class="form-error is-visible"><%= msg %></small>

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

@@ -8,7 +8,7 @@
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
-  <h3 class="section-heading"><%= translated_attribute questionnaire.title %></h3>
+  <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>
   <div class="row">
     <div class="columns large-<%= columns %> medium-centered lead">
       <%= decidim_sanitize_editor translated_attribute questionnaire.description %>
@@ -33,7 +33,7 @@
             <% if visitor_already_answered? %>
               <div class="section">
                 <div class="callout success">
-                  <h5><%= t(".questionnaire_answered.title") %></h5>
+                  <h3 class="heading5"><%= t(".questionnaire_answered.title") %></h3>
                   <p><%= t(".questionnaire_answered.body") %></p>
                 </div>
               </div>
@@ -42,7 +42,7 @@
                 <noscript>
                   <div class="section">
                     <div class="callout warning">
-                      <h5><%= t(".questionnaire_js_disabled.title") %></h5>
+                      <h3 class="heading5"><%= t(".questionnaire_js_disabled.title") %></h3>
                       <p><%= t(".questionnaire_js_disabled.body") %></p>
                     </div>
                   </div>
@@ -50,7 +50,7 @@
                 <% unless current_participatory_space.can_participate?(current_user) %>
                   <div class="section">
                     <div class="callout alert">
-                      <h5><%= t(".questionnaire_for_private_users.title") %></h5>
+                      <h3 class="heading5"><%= t(".questionnaire_for_private_users.title") %></h3>
                       <p><%= t(".questionnaire_for_private_users.body") %></p>
                     </div>
                   </div>
@@ -64,10 +64,10 @@
                   <% @form.responses_by_step.each_with_index do |step_answers, step_index| %>
                     <div id="step-<%= step_index %>" class="<%= step_index.zero? ? "questionnaire-step" : "questionnaire-step hide" %>" data-toggler=".hide">
                       <% if @form.total_steps > 1 %>
-                        <h4 class="section-heading">
+                        <h3 class="section-heading">
                           <%= t(".current_step", step: step_index + 1) %>
                           <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @form.total_steps) %></span>
-                        </h4>
+                        </h3>
                       <% end %>
 
                       <% step_answers.each do |answer| %>
@@ -128,7 +128,7 @@
             <% end %>
           <% else %>
             <div class="answer-questionnaire">
-              <h5 class="section-heading"><%= t(".answer_questionnaire.title") %></h5>
+              <h3 class="section-heading"><%= t(".answer_questionnaire.title") %></h3>
               <p>
                 <%= t(".answer_questionnaire.anonymous_user_message", sign_in_link: decidim.new_user_session_path, sign_up_link: decidim.new_user_registration_path).html_safe %>
               </p>
@@ -141,7 +141,7 @@
         <% else %>
           <div class="section">
             <div class="callout warning">
-              <h4><%= t(".questionnaire_closed.title") %></h4>
+              <h3 class="heading4"><%= t(".questionnaire_closed.title") %></h3>
               <p><%= t(".questionnaire_closed.body") %></p>
             </div>
           </div>
@@ -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/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,8 +1,10 @@
+---
 ar:
   activemodel:
     attributes:
       answer:
         body: إجابة
+        choices: الخيارات
       question:
         max_choices: أقصى عدد من الخيارات
         question_type: نوع
@@ -30,6 +32,9 @@ ar:
             free_text: نص حر
             remove: إزالة
             statement: بيان
+          display_condition:
+            condition_question: سؤال
+            remove: حذف
           edit:
             save: حفظ
           form:
@@ -47,6 +52,8 @@ ar:
             remove: إزالة
             statement: بيان
             up: فوق
+          title_and_description:
+            description: الوصف
           update:
             invalid: كانت هناك مشكلة في حفظ النموذج.
       errors:

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/da.yml

@@ -1 +1,2 @@
+---
 da:

data/config/locales/de.yml

@@ -1,3 +1,4 @@
+---
 de:
   activemodel:
     attributes:
@@ -79,6 +80,7 @@ de:
           form:
             add_question: Frage hinzufügen
             add_separator: Trennzeichen hinzufügen
+            add_title_and_description: Füge Titel und Beschreibung hinzu
             already_answered_warning: Der Fragebogen wird bereits von einigen Benutzern beantwortet, sodass Sie die Fragen nicht ändern können.
             collapse: Alle Fragen einklappen
             expand: Alle Fragen ausklappen
@@ -108,6 +110,15 @@ de:
             remove: Löschen
             separator: Trennzeichen
             up: Hoch
+          title_and_description:
+            collapse: Einklappen
+            description: Beschreibung
+            down: Runter
+            expand: Ausklappen
+            remove: Entfernen
+            title: Titel
+            title_and_description: Titel und Beschreibung
+            up: Hinauf
           update:
             invalid: Beim Speichern des Fragebogens sind Fehler aufgetreten.
             success: Formular erfolgreich gespeichert.
@@ -118,10 +129,6 @@ 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
       question_types:
         files: Dateien
         long_answer: Lange Antwort
@@ -131,6 +138,7 @@ de:
         short_answer: Kurze Antwort
         single_option: Einzelne Option
         sorting: Sortierung
+        title_and_description: Titel und Beschreibung
       questionnaires:
         answer:
           invalid: Bei der Beantwortung des Fragebogens sind Fehler aufgetreten.

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/eo.yml

@@ -1 +1,2 @@
+---
 eo:

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