summaryrefslogtreecommitdiff
path: root/framework/Web/UI
diff options
context:
space:
mode:
authorxue <>2006-01-08 05:50:31 +0000
committerxue <>2006-01-08 05:50:31 +0000
commita71fdccf3a58531ee22372db5a65fe923135b819 (patch)
treee468aec37667eb15adb1a5eaf72856fb4fec4c1a /framework/Web/UI
parent333eedb6eea18fdfb7bc0890cce1c30e6d44d363 (diff)
Added TLogRouter, TLogger (not completed yet)
Diffstat (limited to 'framework/Web/UI')
-rw-r--r--framework/Web/UI/WebControls/TBaseValidator.php50
1 files changed, 32 insertions, 18 deletions
diff --git a/framework/Web/UI/WebControls/TBaseValidator.php b/framework/Web/UI/WebControls/TBaseValidator.php
index 0d88fc43..6326783a 100644
--- a/framework/Web/UI/WebControls/TBaseValidator.php
+++ b/framework/Web/UI/WebControls/TBaseValidator.php
@@ -99,6 +99,12 @@ abstract class TBaseValidator extends TLabel implements IValidator
$this->setForeColor('red');
}
+ protected function onInit($param)
+ {
+ parent::onInit($param);
+ $this->getPage()->getValidators()->add($this);
+ }
+
/**
* Adds attributes to renderer.
* @param THtmlWriter the renderer
@@ -133,8 +139,7 @@ abstract class TBaseValidator extends TLabel implements IValidator
{
$scripts = $this->getPage()->getClientScript();
$scriptKey = "prado:".get_class($this);
- if($this->getEnableClientScript()
- && !$script->isEndScriptRegistered($scriptKey))
+ if($this->getEnableClientScript() && !$scripts->isEndScriptRegistered($scriptKey))
{
$scripts->registerPradoScript('validator');
$js = "Prado.Validation.AddForm('{$this->Page->Form->ClientID}');";
@@ -254,7 +259,7 @@ abstract class TBaseValidator extends TLabel implements IValidator
*/
public function getFocusOnError()
{
- return $this->getViewState('FocusOnError',true);
+ return $this->getViewState('FocusOnError',false);
}
/**
@@ -318,6 +323,28 @@ abstract class TBaseValidator extends TLabel implements IValidator
$this->_isValid=TPropertyValue::ensureBoolean($value);
}
+ protected function getValidationTarget()
+ {
+ if(($id=$this->getControlToValidate())!=='')
+ return $this->findControl($id);
+ else
+ return null;
+ }
+
+ protected function getValidationValue($control)
+ {
+ if($control instanceof IValidatable)
+ {
+ $value=$control->getValidationValue();
+ if($value instanceof TListItem)
+ return $value->getValue();
+ else
+ return TPropertyValue::ensureString($value);
+ }
+ else
+ throw new TInvalidDataTypeException('basevalidator_validatable_required');
+ }
+
/**
* Validates the specified control.
* Do not override this method. Override {@link evaluateIsValid} instead.
@@ -326,22 +353,9 @@ abstract class TBaseValidator extends TLabel implements IValidator
public function validate()
{
$this->setIsValid(true);
- if($this->getVisible(true) && $this->getEnabled())
- {
- $valid=$this->evaluateIsValid();
- $this->setValid($valid);
- }
- if($this->isVisible() && $this->isEnabled() && strlen($this->getControlToValidate()))
- {
+ $control=$this->getValidationTarget();
+ if($control && $this->getVisible(true) && $this->getEnabled())
$valid=$this->evaluateIsValid();
- $this->setValid($valid);
- return $valid;
- }
- else
- {
- $this->setValid(true);
- return true;
- }
}
/**