From 36419b8ceec3d6144ec72fe74b0b1dca23367849 Mon Sep 17 00:00:00 2001 From: Jean-Luc Gyger Date: Sat, 5 Sep 2015 22:43:05 +0200 Subject: Issue 542 --- framework/Web/Javascripts/source/prado/validator/validation3.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js index bdf0f592..44abe295 100644 --- a/framework/Web/Javascripts/source/prado/validator/validation3.js +++ b/framework/Web/Javascripts/source/prado/validator/validation3.js @@ -1597,7 +1597,7 @@ Prado.WebUI.TActiveCustomValidator = jQuery.klass(Prado.WebUI.TBaseValidator, this.options.OnValidate(this, invoker); } - return true; + return this.isValid; }, /** -- cgit v1.2.3 From 141af000ea5f9ab59c54062d9c78bf081013eb24 Mon Sep 17 00:00:00 2001 From: Jean-Luc Gyger Date: Sat, 5 Sep 2015 23:01:47 +0200 Subject: Issue 549 Reset the criteria condition when empty --- framework/Data/DataGateway/TSqlCriteria.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/Data/DataGateway/TSqlCriteria.php b/framework/Data/DataGateway/TSqlCriteria.php index bc1bbbbb..e62aeccd 100644 --- a/framework/Data/DataGateway/TSqlCriteria.php +++ b/framework/Data/DataGateway/TSqlCriteria.php @@ -127,6 +127,8 @@ class TSqlCriteria extends TComponent public function setCondition($value) { if(empty($value)) { + // reset the condition + $this->_condition = ''; return; } -- cgit v1.2.3