decidim-forms 0.23.1.rc1 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d243c84e3cac34d2f57549c5bf93d86f9a2e5e92a2283abe5d12c1b726d7841
-  data.tar.gz: a628e4913fd4c127fb017acbfacef68afc3e620f1f8accecfc84c71ae2d634f2
+  metadata.gz: 00b6fa084292af8d4b343f801ccc5725a7983e3390b41dcd00f2b84b34afc914
+  data.tar.gz: 9f037814dca4fd315e6425074dc2d8c42f8c144d1bb8c5042897dd8ab5410bdf
 SHA512:
-  metadata.gz: 41ee0e65fa6222480e067590b4f4b7ce4c1c58e1c570ea04a980f1a391e2d2e2bc8c3eea4874af7c43ccfa4da4ea222c90ea51160f3f92fdbf282e3d7775b11a
-  data.tar.gz: d3f5d320f806492127a8ea67bd1b88aaba0921cc5f315a8d5cc093c618a0b500e70c5528a28f1b648136301ac0bf6eb2dd3b60af3630352675f83fa0c0dbc624
+  metadata.gz: fc48b056500a941f30b72dd044e9614008b8a0e84111e10af937ce00bab58d13a2e8938a4fa7a8dea9660dbb6c00ffc5b897330f42a9f73a2203edd5c86dd6d9
+  data.tar.gz: a0dbe8818ba0efbe2d7d8b1f9503c5b07cde7023437d81ab5ee1c1695a16631d26e054cc8dd072460c97c652101ef34ef5489e6bfb596cc6376d58f3e53fd184

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/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/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/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.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.23.1.rc1
+  version: 0.23.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-11-12 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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.1
 - !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.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.1
 - !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.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.1.rc1
+        version: 0.23.1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -296,9 +296,9 @@ 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: