decidim-forms 0.27.6 → 0.28.0.rc4

data/config/locales/tr-TR.yml

@@ -18,8 +18,6 @@ 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:
@@ -107,9 +105,6 @@ tr:
           update:
             invalid: Formu kaydederken bir sorun oluştu.
             success: Başarıyla kaydedildi.
-      errors:
-        answer:
-          body: Vücut boş olamaz
       images:
         dimensions: "%{width} x %{height} px"
       question_types:
@@ -129,7 +124,6 @@ tr:
           max_choices: 'Maksimum seçenek: %{n}'
         show:
           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}'

data/config/locales/zh-CN.yml

@@ -18,8 +18,6 @@ zh-CN:
             choices:
               missing: 不完成
               too_many: 太多了
-        questionnaire:
-          request_invalid: 处理请求时出错。请再试一次
   decidim:
     forms:
       admin:
@@ -106,9 +104,6 @@ zh-CN:
           update:
             invalid: 保存表单时出错。
             success: 表单保存成功。
-      errors:
-        answer:
-          body: 主体不能为空
       images:
         dimensions: "%{width} x %{height} px"
       question_types:
@@ -128,7 +123,6 @@ zh-CN:
           max_choices: '最大选择数: %{n}'
         show:
           answer_questionnaire:
-            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/zh-TW.yml

@@ -24,7 +24,7 @@ zh-TW:
               missing: 尚未完成
               too_many: 太多了
         questionnaire:
-          request_invalid: 處理請求時發生錯誤，請再試一次
+          request_invalid: 處理請求時發生錯誤。請再試一次。
   decidim:
     forms:
       admin:
@@ -45,6 +45,8 @@ zh-TW:
             actions:
               back: 返回回覆
               export: 匯出
+              next: 下一個 ›
+              previous: "‹ 上一篇"
               show: 顯示答案
             empty: 目前尚未回答
             export:
@@ -154,7 +156,10 @@ zh-TW:
           max_choices: '最多選擇數量： %{n}'
         show:
           answer_questionnaire:
-            anonymous_user_message: <a href="%{sign_in_link}">使用現有帳號登入</a> 或 <a href="%{sign_up_link}">註冊新帳戶</a> 以回答此表單。
+            already_have_an_account?: 已經有帳號了嗎？
+            are_you_new?: 新用戶?
+            sign_in_description: 登入以填寫問卷
+            sign_up_description: 建立參與者帳號以填寫問卷
             title: 回答表單 
           current_step: 步驟%{step}
           of_total_steps: 的%{total_steps}

data/lib/decidim/forms/engine.rb

@@ -15,6 +15,14 @@ module Decidim
       initializer "decidim_forms.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_forms.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:forms) do |transfer|
+            transfer.move_records(Decidim::Forms::Answer, :decidim_user_id)
+          end
+        end
+      end
     end
   end
 end

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

@@ -5,37 +5,37 @@ require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :questionnaire, class: "Decidim::Forms::Questionnaire" do
-    transient do
-      skip_injection { false }
+    title { generate_localized_title }
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        generate_localized_title
+      end
     end
-    title { generate_localized_title(:questionnaire_title, skip_injection: skip_injection) }
-    description { generate_localized_description(:questionnaire_description, skip_injection: skip_injection) }
-    tos { generate_localized_title(:questionnaire_tos, skip_injection: skip_injection) }
-    questionnaire_for { build(:participatory_process, skip_injection: skip_injection) }
+    tos { generate_localized_title }
+    questionnaire_for { build(:participatory_process) }
     salt { SecureRandom.hex(32) }
 
     trait :with_questions do
       questions do
         position = 0
         qs = %w(short_answer long_answer).collect do |text_question_type|
-          q = build(:questionnaire_question, question_type: text_question_type, position: position, skip_injection: skip_injection)
+          q = build(:questionnaire_question, question_type: text_question_type, position:)
           position += 1
           q
         end
-        qs << build(:questionnaire_question, :with_answer_options, question_type: :single_option, position: position, skip_injection: skip_injection)
+        qs << build(:questionnaire_question, :with_answer_options, question_type: :single_option, position:)
         qs
       end
     end
 
     trait :with_all_questions do
-      after(:build) do |questionaire, evaluator|
+      after(:build) do |questionaire, _evaluator|
         position = 0
         %w(short_answer long_answer).collect do |text_question_type|
           q = create(:questionnaire_question,
                      question_type: text_question_type,
-                     position: position,
-                     questionnaire: questionaire,
-                     skip_injection: evaluator.skip_injection)
+                     position:,
+                     questionnaire: questionaire)
           position += 1
           questionaire.questions << q
         end
@@ -43,9 +43,8 @@ FactoryBot.define do
         %w(single_option multiple_option).each do |option_question_type|
           q = create(:questionnaire_question, :with_answer_options,
                      question_type: option_question_type,
-                     position: position,
-                     questionnaire: questionaire,
-                     skip_injection: evaluator.skip_injection)
+                     position:,
+                     questionnaire: questionaire)
           q.display_conditions.build(
             condition_question: questionaire.questions[q.position - 1],
             question: q,
@@ -59,10 +58,9 @@ FactoryBot.define do
         %w(matrix_single matrix_multiple).collect do |matrix_question_type|
           q = build(:questionnaire_question, :with_answer_options,
                     question_type: matrix_question_type,
-                    position: position,
+                    position:,
                     body: generate_localized_title,
-                    questionnaire: questionaire,
-                    skip_injection: evaluator.skip_injection)
+                    questionnaire: questionaire)
           q.display_conditions.build(
             condition_question: questionaire.questions[q.position - 1],
             question: q,
@@ -84,13 +82,16 @@ FactoryBot.define do
 
   factory :questionnaire_question, class: "Decidim::Forms::Question" do
     transient do
-      skip_injection { false }
       options { [] }
       rows { [] }
     end
 
-    body { generate_localized_title(:questionnaire_question_body, skip_injection: skip_injection) }
-    description { generate_localized_description(:questionnaire_question_description, skip_injection: skip_injection) }
+    body { generate_localized_title }
+    description do
+      Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+        generate_localized_title
+      end
+    end
     mandatory { false }
     position { 0 }
     question_type { Decidim::Forms::Question::TYPES.first }
@@ -118,13 +119,13 @@ FactoryBot.define do
 
     trait :with_answer_options do
       answer_options do
-        Array.new(3).collect { build(:answer_option, skip_injection: skip_injection) }
+        Array.new(3).collect { build(:answer_option) }
       end
     end
 
     trait :conditioned do
       display_conditions do
-        Array.new(3).collect { build(:display_condition, skip_injection: skip_injection) }
+        Array.new(3).collect { build(:display_condition) }
       end
     end
 
@@ -138,28 +139,22 @@ FactoryBot.define do
   end
 
   factory :answer, class: "Decidim::Forms::Answer" do
-    transient do
-      skip_injection { false }
-    end
     body { "hola" }
     questionnaire
-    question { create(:questionnaire_question, questionnaire: questionnaire, skip_injection: skip_injection) }
-    user { create(:user, organization: questionnaire.questionnaire_for.organization, skip_injection: skip_injection) }
+    question { create(:questionnaire_question, questionnaire:) }
+    user { create(:user, organization: questionnaire.questionnaire_for.organization) }
     session_token { Digest::MD5.hexdigest(user.id.to_s) }
 
     trait :with_attachments do
-      after(:create) do |answer, evaluator|
-        create :attachment, :with_image, attached_to: answer, skip_injection: evaluator.skip_injection
-        create :attachment, :with_pdf, attached_to: answer, skip_injection: evaluator.skip_injection
+      after(:create) do |answer, _evaluator|
+        create :attachment, :with_image, attached_to: answer
+        create :attachment, :with_pdf, attached_to: answer
       end
     end
   end
 
   factory :answer_option, class: "Decidim::Forms::AnswerOption" do
-    transient do
-      skip_injection { false }
-    end
-    question { create(:questionnaire_question, skip_injection: skip_injection) }
+    question { create(:questionnaire_question) }
     body { generate_localized_title }
     free_text { false }
 
@@ -173,40 +168,31 @@ FactoryBot.define do
   end
 
   factory :answer_choice, class: "Decidim::Forms::AnswerChoice" do
-    transient do
-      skip_injection { false }
-    end
     answer
-    answer_option { create(:answer_option, question: answer.question, skip_injection: skip_injection) }
-    matrix_row { create(:question_matrix_row, question: answer.question, skip_injection: skip_injection) }
+    answer_option { create(:answer_option, question: answer.question) }
+    matrix_row { create(:question_matrix_row, question: answer.question) }
   end
 
   factory :question_matrix_row, class: "Decidim::Forms::QuestionMatrixRow" do
-    transient do
-      skip_injection { false }
-    end
-    question { create(:questionnaire_question, skip_injection: skip_injection) }
+    question { create(:questionnaire_question) }
     body { generate_localized_title }
     position { 0 }
   end
 
   factory :display_condition, class: "Decidim::Forms::DisplayCondition" do
-    transient do
-      skip_injection { false }
-    end
-    condition_question { create(:questionnaire_question, skip_injection: skip_injection) }
-    question { create(:questionnaire_question, position: 1, skip_injection: skip_injection) }
+    condition_question { create(:questionnaire_question) }
+    question { create(:questionnaire_question, position: 1) }
     condition_type { :answered }
     mandatory { true }
 
     trait :equal do
       condition_type { :equal }
-      answer_option { create(:answer_option, question: condition_question, skip_injection: skip_injection) }
+      answer_option { create(:answer_option, question: condition_question) }
     end
 
     trait :match do
       condition_type { :match }
-      condition_value { generate_localized_title(:condition_value, skip_injection: skip_injection) }
+      condition_value { generate_localized_title }
     end
   end
 end