summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorJens Klaer <kj.landwehr.software@gmail.com>2015-10-14 14:17:42 +0200
committerJens Klaer <kj.landwehr.software@gmail.com>2015-10-14 14:17:42 +0200
commit93f92ff0546e0a054ab8291f78a581b77dab8088 (patch)
tree4f872f63c75cfc73497bebfca09ba12e8af41c6f /framework
parent097fc323f198b29e298f1a30ae7c9ea8ff89056a (diff)
parent141af000ea5f9ab59c54062d9c78bf081013eb24 (diff)
Merge pull request #553 from majuca/master
Issue 542 and 549
Diffstat (limited to 'framework')
-rw-r--r--framework/Data/DataGateway/TSqlCriteria.php2
-rw-r--r--framework/Web/Javascripts/source/prado/validator/validation3.js2
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;
},
/**