diff --git a/common/js/unittest/unittest_validator.html b/common/js/unittest/unittest_validator.html index 5d599b564..ee24489b5 100644 --- a/common/js/unittest/unittest_validator.html +++ b/common/js/unittest/unittest_validator.html @@ -58,13 +58,13 @@ describe('Validator', { }, 'validate with length' : function() { v.cast('ADD_FILTER', ['minlen', { - 'text' : {required:true, minlen:5} + 'text' : {required:true, maxlength:5} }]); v.cast('ADD_FILTER', ['maxlen', { - 'text' : {required:true, maxlen:10} + 'text' : {required:true, maxlength:10} }]); v.cast('ADD_FILTER', ['minmaxlen', { - 'text' : {required:true, minlen:5, maxlen:10} + 'text' : {required:true, maxlength:5, maxlength:10,rule:'userid'} }]); set_filter('minlen'); @@ -88,13 +88,13 @@ describe('Validator', { set_value('1'); value_of(validate()).should_be_false(); - set_value('12345678901'); + set_value('a12345678901'); value_of(validate()).should_be_false(); - set_value('12345'); + set_value('a12345'); value_of(validate()).should_be_true(); - set_value('1234567'); + set_value('a1234567'); value_of(validate()).should_be_true(); } }) diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js index 301e4bae9..6113346ef 100644 --- a/common/js/xml_js_filter.js +++ b/common/js/xml_js_filter.js @@ -98,8 +98,8 @@ var Validator = xe.createApp('Validator', { if (!_el) return true; var el = $(_el), val = $.trim(get_value(el)); - var minlen = parseInt(this.minlen) || 0; - var maxlen = parseInt(this.maxlen) || 0; + var minlen = parseInt(this.minlength) || 0; + var maxlen = parseInt(this.maxlength) || 0; var rule = (this.rule || '').split(','); if (this.required && !val) return (result = (!!self.cast('ALERT', [form, name, 'isnull']) && false));