From 3ef3a36d430521be2cd40a10b57153e52f20596c Mon Sep 17 00:00:00 2001 From: zero Date: Tue, 9 Mar 2010 09:37:38 +0000 Subject: [PATCH 1/4] fix comment page list git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7330 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/queries/getCommentPageList.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/comment/queries/getCommentPageList.xml b/modules/comment/queries/getCommentPageList.xml index fd0f099fa..5a43a9320 100644 --- a/modules/comment/queries/getCommentPageList.xml +++ b/modules/comment/queries/getCommentPageList.xml @@ -14,7 +14,8 @@ - + + From df6b14ce57df9400b8cbead6389d109f3237e0f8 Mon Sep 17 00:00:00 2001 From: taggon Date: Tue, 9 Mar 2010 09:43:08 +0000 Subject: [PATCH 2/4] fix typo : minlen -> minlength, maxlen -> maxlength git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7331 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/unittest/unittest_validator.html | 12 ++++++------ common/js/xml_js_filter.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) 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)); From c2baeee4a30d993e02bc1206da2ceda90f570c82 Mon Sep 17 00:00:00 2001 From: taggon Date: Tue, 9 Mar 2010 09:49:30 +0000 Subject: [PATCH 3/4] fix unittest_validator git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7332 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/js/unittest/unittest_validator.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/common/js/unittest/unittest_validator.html b/common/js/unittest/unittest_validator.html index ee24489b5..e2f2b9d69 100644 --- a/common/js/unittest/unittest_validator.html +++ b/common/js/unittest/unittest_validator.html @@ -57,17 +57,17 @@ describe('Validator', { value_of(validate()).should_be_true(); }, 'validate with length' : function() { - v.cast('ADD_FILTER', ['minlen', { - 'text' : {required:true, maxlength:5} + v.cast('ADD_FILTER', ['minlength', { + 'text' : {required:true, minlength:5} }]); - v.cast('ADD_FILTER', ['maxlen', { + v.cast('ADD_FILTER', ['maxlength', { 'text' : {required:true, maxlength:10} }]); - v.cast('ADD_FILTER', ['minmaxlen', { - 'text' : {required:true, maxlength:5, maxlength:10,rule:'userid'} + v.cast('ADD_FILTER', ['minmaxlength', { + 'text' : {required:true, minlength:5, maxlength:10} }]); - set_filter('minlen'); + set_filter('minlength'); set_value('1'); value_of(validate()).should_be_false(); @@ -75,7 +75,7 @@ describe('Validator', { set_value('12345'); value_of(validate()).should_be_true(); - set_filter('maxlen'); + set_filter('maxlength'); set_value('12345678901'); value_of(validate()).should_be_false(); @@ -83,18 +83,18 @@ describe('Validator', { set_value('1'); value_of(validate()).should_be_true(); - set_filter('minmaxlen'); + set_filter('minmaxlength'); set_value('1'); value_of(validate()).should_be_false(); - set_value('a12345678901'); + set_value('12345678901'); value_of(validate()).should_be_false(); - set_value('a12345'); + set_value('12345'); value_of(validate()).should_be_true(); - set_value('a1234567'); + set_value('1234567'); value_of(validate()).should_be_true(); } }) From 1319140ee14e854821ffde07c8cb9cff0ae173c6 Mon Sep 17 00:00:00 2001 From: haneul Date: Tue, 9 Mar 2010 09:51:06 +0000 Subject: [PATCH 4/4] version up to 1.4.0.9 git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7333 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- config/config.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.inc.php b/config/config.inc.php index 147edbe2d..9a2abeeb8 100644 --- a/config/config.inc.php +++ b/config/config.inc.php @@ -13,7 +13,7 @@ * @brief XE의 전체 버전 표기 * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함 **/ - define('__ZBXE_VERSION__', '1.4.0.8'); + define('__ZBXE_VERSION__', '1.4.0.9'); /** * @brief zbXE가 설치된 장소의 base path를 구함