decidim-forms 0.23.1.rc1 → 0.23.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d243c84e3cac34d2f57549c5bf93d86f9a2e5e92a2283abe5d12c1b726d7841
-  data.tar.gz: a628e4913fd4c127fb017acbfacef68afc3e620f1f8accecfc84c71ae2d634f2
+  metadata.gz: f212da040c3abc63f60991190199bd8d92e2c15e1f6fac388bb60bac27d43178
+  data.tar.gz: 85e5adffaebc240c553d516beaf5cd29ed0cf7ed2ddd1683e014a37ec606ebfc
 SHA512:
-  metadata.gz: 41ee0e65fa6222480e067590b4f4b7ce4c1c58e1c570ea04a980f1a391e2d2e2bc8c3eea4874af7c43ccfa4da4ea222c90ea51160f3f92fdbf282e3d7775b11a
-  data.tar.gz: d3f5d320f806492127a8ea67bd1b88aaba0921cc5f315a8d5cc093c618a0b500e70c5528a28f1b648136301ac0bf6eb2dd3b60af3630352675f83fa0c0dbc624
+  metadata.gz: a7ae29f38e5dfce43d341d0b1ba6a62358dc3aacfa0fa5a5bcc6dfa400d104f1c24a34b8f90755bbcbadb9cc622c520ea7ccac3fd1a1b01e2972b9674e34eede
+  data.tar.gz: 3cf67abba6cc26434ed48948905e8be1a2523ae3426df936da47900a962f37da1eb76700a51ed7d17bc47847204707b0407b6c260ecdb71b0868c93900a1334c

data/app/assets/javascripts/decidim/forms/display_conditions.component.js.es6

@@ -29,14 +29,13 @@
       let multipleInput = [];
 
       $conditionWrapperField.find(".radio-button-collection, .check-box-collection").find(".collection-input").each((idx, el) => {
-        const $label = $(el).find("label");
-        const checked = !$label.find("input[type='hidden']").is("[disabled]");
+        const $input = $(el).find("input[name$=\\[body\\]]");
+        const checked = $input.is(":checked");
 
         if (checked) {
-          const $textField = $(el).find("input[name$=\\[custom_body\\]]");
-          const text = $textField.val();
-          const value = $label.find("input:not([type='hidden'])").val();
-          const id = $label.find("input[type='hidden']").val();
+          const text = $(el).find("input[name$=\\[custom_body\\]]").val();
+          const value = $input.val();
+          const id = $(el).find("input[name$=\\[answer_option_id\\]]").val();
 
           multipleInput.push({ id, value, text });
         }

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

@@ -131,8 +131,9 @@ module Decidim
             @session_token ||= tokenize(id || session_id)
           end
 
-          def tokenize(id)
-            Digest::MD5.hexdigest("#{id}-#{Rails.application.secrets.secret_key_base}")
+          def tokenize(id, length: 10)
+            tokenizer = Decidim::Tokenizer.new(salt: questionnaire.salt || questionnaire.id, length: length)
+            tokenizer.int_digest(id).to_s
           end
         end
       end

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

@@ -51,7 +51,7 @@ module Decidim
 
       def display_conditions_fulfilled?
         question.display_conditions.all? do |condition|
-          answer = question.questionnaire.answers.find_by(question: condition.condition_question)
+          answer = context.responses&.find { |r| r.question_id&.to_i == condition.condition_question.id }
           condition.fulfilled?(answer)
         end
       end

data/app/forms/decidim/forms/questionnaire_form.rb

@@ -23,6 +23,11 @@ module Decidim
         end
       end
 
+      # Add other responses to the context so AnswerForm can validate conditional questions
+      def before_validation
+        context.responses = attributes[:responses]
+      end
+
       # Public: Splits reponses by step, keeping the separator.
       #
       # Returns an array of steps. Each step is a list of the questions in that

data/app/helpers/decidim/forms/admin/questionnaire_answers_helper.rb

@@ -7,13 +7,16 @@ module Decidim
       #
       module QuestionnaireAnswersHelper
         def first_table_th(answer)
-          return translated_attribute answer.first_short_answer.question.body if answer.first_short_answer
+          if answer.first_short_answer
+            @first_short_answer = answer.first_short_answer
+            return translated_attribute @first_short_answer.question.body
+          end
 
           t("session_token", scope: "decidim.forms.user_answers_serializer")
         end
 
         def first_table_td(answer)
-          return answer.first_short_answer.body if answer.first_short_answer
+          return answer.first_short_answer&.body if @first_short_answer
 
           answer.session_token
         end

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

@@ -21,18 +21,19 @@ module Decidim
       # Answer option provided to check for "equal" or "not_equal" (optional)
       belongs_to :answer_option, class_name: "AnswerOption", foreign_key: "decidim_answer_option_id", optional: true
 
-      def fulfilled?(answer)
+      def fulfilled?(answer_form)
+        return answer_form.present? if condition_type == "answered"
+        return answer_form.blank? if condition_type == "not_answered"
+        # rest of options require presence
+        return if answer_form.blank?
+
         case condition_type
-        when "answered"
-          answer.present?
-        when "not_answered"
-          answer.blank?
         when "equal"
-          answer.present? ? answer.choices.pluck(:decidim_answer_option_id).include?(answer_option.id) : false
+          answer_form.choices.pluck(:answer_option_id).include?(answer_option.id)
         when "not_equal"
-          answer.present? ? !answer.choices.pluck(:decidim_answer_option_id).include?(answer_option.id) : true
+          answer_form.choices.pluck(:answer_option_id).exclude?(answer_option.id)
         when "match"
-          answer.present? ? condition_value.values.any? { |value| answer.body.match?(Regexp.new(value, Regexp::IGNORECASE)) } : false
+          condition_value.values.reject(&:blank?).any? { |value| answer_form_matches?(answer_form, value) }
         end
       end
 
@@ -46,6 +47,19 @@ module Decidim
           value: condition_value&.dig(I18n.locale.to_s)
         }.compact
       end
+
+      private
+
+      def answer_form_matches?(answer_form, value)
+        search = Regexp.new(value, Regexp::IGNORECASE)
+        if answer_form.body
+          answer_form.body.match?(search)
+        else
+          answer_form.choices.any? do |choice_value|
+            choice_value.body&.match?(search) || choice_value.custom_body&.match?(search)
+          end
+        end
+      end
     end
   end
 end

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

@@ -14,6 +14,8 @@ module Decidim
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
       has_many :answers, class_name: "Answer", foreign_key: "decidim_questionnaire_id", dependent: :destroy
 
+      after_initialize :set_default_salt
+
       # Public: returns whether the questionnaire questions can be modified or not.
       def questions_editable?
         has_component = questionnaire_for.respond_to? :component
@@ -29,6 +31,15 @@ module Decidim
       def pristine?
         created_at.to_i == updated_at.to_i && questions.empty?
       end
+
+      private
+
+      # salt is used to generate secure hash in anonymous answers
+      def set_default_salt
+        return unless defined?(salt)
+
+        self.salt ||= Tokenizer.random_salt
+      end
     end
   end
 end

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

@@ -52,7 +52,7 @@ module Decidim
         private
 
         def sibilings
-          Answer.where(session_token: participant.session_token).joins(:question).order("decidim_forms_questions.position ASC")
+          Answer.where(questionnaire: questionnaire, session_token: participant.session_token).joins(:question).order("decidim_forms_questions.position ASC")
         end
       end
     end

data/config/locales/cs.yml

@@ -74,8 +74,8 @@ cs:
           form:
             add_question: Přidat otázku
             add_separator: Přidat oddělovač
-            already_answered_warning: Dotazník již odpověděli někteří uživatelé, takže nemusíte upravovat své dotazy.
-            collapse: Sbalit všechny úlohy
+            already_answered_warning: Formulář je již zodpovězen některými uživateli, takže jeho otázky nemůžete upravovat.
+            collapse: Sbalit všechny otázky
             expand: Rozbalit všechny otázky
             preview: Náhled
             title: Upravit formulář

data/config/locales/de.yml

@@ -3,6 +3,8 @@ de:
     attributes:
       answer:
         body: Antworten
+        choices: Auswahl
+        selected_choices: Ausgewählte Auswahl
       question:
         max_choices: Maximale Anzahl von Auswahlmöglichkeiten
         question_type: Art

data/config/locales/fr.yml

@@ -105,7 +105,7 @@ fr:
             up: Haut
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
-            success: Le formulaire a bien été sauvegardé.
+            success: Le questionnaire a bien été sauvegardé.
       errors:
         answer:
           body: Le corps ne peut pas être vide
@@ -152,7 +152,7 @@ fr:
             title: JavaScript est désactivé
           questionnaire_not_published:
             body: Ce formulaire n'est pas encore publié.
-          tos_agreement: En participant, vous acceptez ses conditions d'utilisation
+          tos_agreement: En participant, vous acceptez ces conditions d'utilisation
       step_navigation:
         show:
           are_you_sure: Cette action ne peut pas être annulée et vous ne pourrez pas modifier vos réponses. Êtes-vous sûr?

data/config/locales/gl.yml

@@ -33,6 +33,7 @@ gl:
           form:
             add_question: Engadir pregunta
             already_answered_warning: Algúns usuarios xa responderon o cuestionario para que non poida modificar as súas preguntas.
+            title: Editar formulario
           matrix_row:
             remove: Quitar
             statement: Declaración
@@ -50,6 +51,8 @@ gl:
       errors:
         answer:
           body: O corpo non pode estar en branco
+      files:
+        extension_whitelist: 'Formatos aceptados:'
       question_types:
         long_answer: Resposta longa
         multiple_option: Múltipla opción

data/config/locales/ja.yml

@@ -132,7 +132,7 @@ ja:
           max_choices: '最大選択肢: %{n}'
         show:
           answer_questionnaire:
-            anonymous_user_message: <a href="%{sign_in_link}">アカウント</a> でログインするか、 <a href="%{sign_up_link}">ユーザ登録</a> してフォームに回答してください。
+            anonymous_user_message: <a href="%{sign_in_link}">あなたのアカウントでログインする</a> か、 <a href="%{sign_up_link}">ユーザー登録</a> してフォームに回答してください。
             title: フォームに回答
           current_step: ステップ %{step}
           of_total_steps: / %{total_steps}

data/config/locales/no.yml

@@ -53,6 +53,7 @@
           form:
             add_question: Legg til spørsmål
             already_answered_warning: Skjemaet er allerede besvart av noen brukere derfor kan du ikke endre spørsmålene.
+            title: Rediger skjema
           matrix_row:
             remove: Fjern
             statement: Uttalelse

data/config/locales/pl.yml

@@ -3,6 +3,8 @@ pl:
     attributes:
       answer:
         body: Odpowiedź
+        choices: Opcje
+        selected_choices: Wybrane opcje
       question:
         max_choices: Maksymalna liczba opcji do wyboru
         question_type: Typ
@@ -103,6 +105,7 @@ pl:
             up: W górę
           update:
             invalid: Podczas zapisywania formularza wystąpił błąd.
+            success: Formularz został zapisany.
       errors:
         answer:
           body: Treść nie może być pusta

data/config/locales/ro-RO.yml

@@ -3,6 +3,8 @@ ro:
     attributes:
       answer:
         body: Răspuns
+        choices: Opțiuni
+        selected_choices: Alegeri selectate
       question:
         max_choices: Numărul maxim de opțiuni
         question_type: Tip
@@ -103,6 +105,7 @@ ro:
             up: Sus
           update:
             invalid: A apărut o eroare la salvarea formularului.
+            success: Formular salvat cu succes.
       errors:
         answer:
           body: Corpul nu poate fi gol
@@ -152,8 +155,10 @@ ro:
           tos_agreement: Prin participare acceptați termenii și condițiile sale de utilizare
       step_navigation:
         show:
+          are_you_sure: Această acțiune nu poate fi anulată și nu veți putea să vă editați răspunsurile. Sunteți sigur?
           back: Înapoi
           continue: Continuă
+          submit: Trimiteți
       user_answers_serializer:
         body: Răspuns
         completion: Finalizare

data/config/locales/si-LK.yml

@@ -0,0 +1 @@
+si:

data/config/locales/sv.yml

@@ -3,6 +3,7 @@ sv:
     attributes:
       answer:
         body: Svar
+        choices: Val
       question:
         max_choices: Högst antal val
         question_type: Typ

data/config/locales/sw-KE.yml

@@ -0,0 +1 @@
+sw:

data/config/locales/tr-TR.yml

@@ -3,6 +3,8 @@ tr:
     attributes:
       answer:
         body: Cevap
+        choices: Seçenekler
+        selected_choices: Seçilmiş seçenekler
       question:
         max_choices: Maksimum seçenek sayısı
         question_type: tip
@@ -15,6 +17,8 @@ tr:
             choices:
               missing: tamamlanmadı
               too_many: çok fazla
+        questionnaire:
+          request_invalid: İsteği işlerken bir hata oluştu. Lütfen tekrar deneyin
   decidim:
     forms:
       admin:
@@ -23,42 +27,108 @@ tr:
             description: Açıklama
             tos: Kullanım Şartları
         questionnaires:
+          actions:
+            back: Sorulara geri dön
+            show: Yanıtları göster
           answer_option:
             answer_option: Cevap seçeneği
             free_text: Ücretsiz Metin
             remove: Kaldır
             statement: Beyan
+          answers:
+            actions:
+              back: Yanıtlara dön
+              export: Dışa aktar
+              show: Cevapları göster
+            empty: Henüz cevap bulunmuyor
+            export:
+              answer:
+                title: '#%{number} yanıt'
+            export_response:
+              title: survey_user_answers _%{token}
+            index:
+              title: "%{total} toplam yanıt"
+            show:
+              title: '%{number} cevap'
+          display_condition:
+            answer_option: Cevap seçeneği
+            condition_question: Soru
+            condition_type: Durum
+            condition_types:
+              answered: Cevaplanmış
+              equal: Eşittir
+              match: Metin içerir
+              not_answered: Cevaplanmadı
+              not_equal: Eşit değil
+            condition_value: Metin içerir
+            display_condition: Görüntüleme koşulları
+            mandatory: Bu koşul, diğer koşulların durumuna bakılmaksızın her zaman yerine getirilmelidir
+            remove: Kaldır
+            save_warning: Görüntüleme koşullarını yapılandırmadan önce formu kaydetmeyi unutmayın
+            select_answer_option: Cevap seçeneğini seçin
+            select_condition_question: Bir soru seçin
+            select_condition_type: Bir koşul türü seçin
           edit:
             save: Kayıt etmek
+            title: Anketi düzenleyin
           form:
             add_question: Soru ekle
+            add_separator: Ayırıcı ekle
             already_answered_warning: Form, bazı kullanıcılar tarafından zaten yanıtlandı, bu nedenle sorularını değiştiremezsiniz.
+            collapse: Tüm soruları daraltın
+            expand: Tüm soruları genişletin
+            preview: Önizleme
+            title: Formu düzenle
+            unpublished_warning: Form yayınlanmadı. Sorularını değiştirebilirsiniz, ancak bunu yapmak mevcut cevapları silecektir.
           matrix_row:
+            matrix_row: Satır
             remove: Kaldır
             statement: Beyan
           question:
             add_answer_option: Cevap seçeneği ekle
+            add_display_condition: Görüntü koşulu ekle
+            add_display_condition_info: Görüntüleme koşullarını yapılandırmak için formu kaydedin
+            add_matrix_row: Satır ekle
             any: herhangi
+            collapse: Daralt
             description: Açıklama
             down: Aşağı
+            expand: Genişlet
             question: Soru
             remove: Kaldır
             statement: Beyan
             up: yukarı
+          separator:
+            down: Aşağı
+            remove: Kaldır
+            separator: Ayraç
+            up: Yukarı
           update:
             invalid: Formu kaydederken bir sorun oluştu.
+            success: Başarıyla kaydedildi.
       errors:
         answer:
           body: Vücut boş olamaz
+      files:
+        extension_whitelist: 'Kabul edilen biçimler:'
+      images:
+        dimensions: "%{width} x %{height} px"
+        dimensions_info: 'Bu resim:'
+        processors:
+          resize_and_pad: Yeniden boyutlandırıldı ve dolduruldu
+          resize_to_fit: Sığacak şekilde yeniden boyutlandırıldı
       question_types:
         long_answer: Uzun cevap
+        matrix_multiple: Matris (Çoklu seçenek)
+        matrix_single: Matris (Tek seçenek)
         multiple_option: Çoklu seçenek
         short_answer: Kısa cevap
         single_option: Tek seçenek
-        sorting: sınıflandırma
+        sorting: Sıralama
       questionnaires:
         answer:
           invalid: Formu yanıtlarken bir sorun oluştu.
+          max_choices_alert: Çok fazla seçenek seçilmiş
           success: Form başarıyla cevaplandı.
         question:
           max_choices: 'Maksimum seçenek: %{n}'
@@ -66,6 +136,8 @@ tr:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">Formu yanıtlamak için</a> veya <a href="%{sign_up_link}">hesabınızla giriş yapın</a>.
             title: Formu cevapla
+          current_step: '%{step} adım'
+          of_total_steps: '%{total_steps}'
           questionnaire_answered:
             body: Bu formu zaten cevapladınız.
             title: Zaten cevaplandı
@@ -75,11 +147,26 @@ tr:
           questionnaire_for_private_users:
             body: Form yalnızca özel kullanıcılar tarafından kullanılabilir
             title: Form kapatıldı
+          questionnaire_js_disabled:
+            body: Bu formun bazı özellikleri devre dışı bırakılacak. Deneyiminizi iyileştirmek için lütfen tarayıcınızda JavaScript'i etkinleştirin.
+            title: JavaScript devre dışı
+          questionnaire_not_published:
+            body: Bu form henüz yayınlanmadı.
           tos_agreement: Katılarak Hizmet Şartlarını kabul etmiş olursunuz.
       step_navigation:
         show:
           are_you_sure: Bu işlem geri alınamaz ve cevaplarınızı düzenleyemezsiniz. Emin misiniz?
+          back: Geri
+          continue: Devam et
           submit: Gönder
       user_answers_serializer:
+        body: Cevap
+        completion: Tamamlanma
         created_at: Yanıtlandı
         id: Cevap kimliği
+        ip_hash: IP Hash
+        question: Soru
+        registered: Kayıtlı
+        session_token: Kullanıcı tanımlayıcı
+        unregistered: Kayıtlı değil
+        user_status: Kullanıcı durumu

data/db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddSaltToDecidimFormsQuestionnaires < ActiveRecord::Migration[5.2]
+  class Questionnaire < ApplicationRecord
+    self.table_name = :decidim_forms_questionnaires
+  end
+
+  def change
+    add_column :decidim_forms_questionnaires, :salt, :string
+
+    Questionnaire.find_each do |questionnaire|
+      questionnaire.salt = Decidim::Tokenizer.random_salt
+      questionnaire.save!
+    end
+  end
+end

data/lib/decidim/forms/test/factories.rb

@@ -13,6 +13,7 @@ FactoryBot.define do
     end
     tos { generate_localized_title }
     questionnaire_for { build(:participatory_process) }
+    salt { SecureRandom.hex(32) }
 
     trait :with_questions do
       questions do

data/lib/decidim/forms/user_answers_serializer.rb

@@ -16,7 +16,7 @@ module Decidim
       def serialize
         @answers.each_with_index.inject({}) do |serialized, (answer, idx)|
           serialized.update(
-            answer_translated_attribute_name(:id) => answer.id,
+            answer_translated_attribute_name(:id) => answer.session_token,
             answer_translated_attribute_name(:created_at) => answer.created_at.to_s(:db),
             answer_translated_attribute_name(:ip_hash) => answer.ip_hash,
             answer_translated_attribute_name(:user_status) => answer_translated_attribute_name(answer.decidim_user_id.present? ? "registered" : "unregistered"),

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.23.1.rc1"
+      "0.23.5"
     end
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.23.1.rc1
+  version: 0.23.5
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
 - Marc Riera Casals
 - Oriol Gual Oliva
 - Rubén González Valero
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.5
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.5
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.5
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -238,12 +238,14 @@ files:
 - config/locales/pt.yml
 - config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/si-LK.yml
 - config/locales/sk-SK.yml
 - config/locales/sk.yml
 - config/locales/sl.yml
 - config/locales/so-SO.yml
 - config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/sw-KE.yml
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -261,6 +263,7 @@ files:
 - db/migrate/20200130194123_create_decidim_forms_display_conditions.rb
 - db/migrate/20200225123810_create_decidim_forms_question_matrix_rows.rb
 - db/migrate/20200304152939_add_matrix_row_id_to_decidim_forms_answer_choices.rb
+- db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb
 - lib/decidim/api/questionnaire_entity_interface.rb
 - lib/decidim/exporters/form_pdf.rb
 - lib/decidim/exporters/form_pdf_controller_helper.rb
@@ -285,7 +288,7 @@ homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -296,12 +299,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Decidim forms
 test_files: []