diff options
| -rw-r--r-- | framework/Data/DataGateway/TSqlCriteria.php | 2 | ||||
| -rw-r--r-- | framework/Web/Javascripts/source/prado/validator/validation3.js | 2 |
2 files changed, 3 insertions, 1 deletions
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; } diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js index 24466599..98be95d7 100644 --- a/framework/Web/Javascripts/source/prado/validator/validation3.js +++ b/framework/Web/Javascripts/source/prado/validator/validation3.js @@ -1603,7 +1603,7 @@ Prado.WebUI.TActiveCustomValidator = jQuery.klass(Prado.WebUI.TBaseValidator, this.options.OnValidate(this, invoker); } - return true; + return this.isValid; }, /** |