Merge pull request DavyJonesLocker#369 from michaelbaldry/master

Do not validate fields with _destroy="1" in their input group
musicglue · Aug 16, 2012 · 2a4d5f4 · 2a4d5f4
2 parents fe69111 + c8da755
commit 2a4d5f4
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 59 deletions.
diff --git a/coffeescript/rails.validations.coffee b/coffeescript/rails.validations.coffee
@@ -86,41 +86,51 @@ validateForm = (form, validators) ->
 
 validateElement = (element, validators) ->
   element.trigger('element:validate:before')
-
+
-  if element.data('changed') != false
+  passElement = ->
+    element.trigger('element:validate:pass').data('valid', null)
+
+  failElement = (message) ->
+    element.trigger('element:validate:fail', message).data('valid', false)
+    false
+
+  afterValidate = ->
+    element.trigger('element:validate:after').data('valid') != false
+
+  executeValidators = (context) ->
     valid = true
-    element.data('changed', false)
+
-
-    # Because 'length' is defined on the list of validators we cannot call jQuery.each on
-    context = ClientSideValidations.validators.local
     for kind, fn of context
       if validators[kind]
         for validator in validators[kind]
           if message = fn.call(context, element, validator)
-            element.trigger('element:validate:fail', message).data('valid', false)
+            valid = failElement(message)
-            valid = false
             break
         unless valid
           break
+
+    valid
+
+
+  # if _destroy for this input group == "1" pass with flying colours, it'll get deleted anyway..
+  destroyInputName = element.attr('name').replace(/\[([^\]]*?)\]$/, '[_destroy]')
+  if $("input[name='#{destroyInputName}']").val() == "1"
+    passElement()
+    return afterValidate()
+
+  # if the value hasn't changed since last validation, do nothing
+  unless element.data('changed') != false
+    return afterValidate()
 
-    if valid
+  element.data('changed', false)
-      context = ClientSideValidations.validators.remote
-      for kind, fn of context
-        if validators[kind]
-          for validator in validators[kind]
-            if message = fn.call(context, element, validator)
-              element.trigger('element:validate:fail', message).data('valid', false)
-              valid = false
-              break
-        unless valid
-          break
 
-    if valid
+  local = ClientSideValidations.validators.local
-      element.data('valid', null)
+  remote = ClientSideValidations.validators.remote
-      element.trigger('element:validate:pass')
 
-  element.trigger('element:validate:after')
+  if executeValidators(local) and executeValidators(remote)
-  element.data('valid') != false
+    passElement() 
+
+  afterValidate()
 
 # Main hook
 # If new forms are dynamically introduced into the DOM the .validate() method

diff --git a/test/javascript/public/test/validateElement.js b/test/javascript/public/test/validateElement.js
@@ -61,7 +61,14 @@ module('Validate Element', {
           id: 'user_phone_numbers_attributes_0_number',
           'data-validate': 'true',
           type: 'text'
-        }))
+        })
+        .append($('<input />', {
+          name: 'user[phone_numbers_attributes][0][_destroy]',
+          id: 'user_phone_numbers_attributes_0__destroy',
+          'data-validate': 'true',
+          type: 'hidden',
+          value: "1"
+        })))
         .append($('<label for="user_phone_numbers_attributes_1_number">Phone Number</label>'))
         .append($('<input />', {
           name: 'user[phone_numbers_attributes][1][number]',
@@ -114,8 +121,8 @@ test('Validate nested attributes', function() {
   input = form.find('input#user_phone_numbers_attributes_0_number');
   label = $('label[for="user_phone_numbers_attributes_0_number"]');
   input.trigger('focusout');
-  ok(input.parent().hasClass('field_with_errors'));
+  equal(input.parent().hasClass('field_with_errors'), false);
-  ok(label.parent().hasClass('field_with_errors'));
+  equal(label.parent().hasClass('field_with_errors'), false);
 });
 
 test('Validate when keyup on confirmation', function() {

diff --git a/vendor/assets/javascripts/rails.validations.js b/vendor/assets/javascripts/rails.validations.js