Changeset 2100

Timestamp:

07/27/2007 02:37:47 PM (15 months ago)

Author:

xue

Message:

Validators will not validate disabled controls

Location:

trunk

Files:

• HISTORY (modified) (2 diffs)
• framework/Web/Javascripts/source/prado/validator/validation3.js (modified) (2 diffs)
• framework/Web/UI/WebControls/TBaseValidator.php (modified) (1 diff)

trunk/HISTORY

@@ -2 +2 @@
 ============================
 BUG: Ticket#592 - TRadioButton with UniqueGroupName always return false to getChecked (Christophe)
+BUG: Ticket#648 - Validation: onClick and onBlur events order (Christophe)
 BUG: Ticket#656 - TDatePicker does not return correct value when in callback mode (Christophe)
 BUG: Ticket#662 - Ensure TForm to properly encode the ampersand in action URL (Qiang)
 BUG: Ticket#666 - TActiveRecord::deleteAll() method always requires a criteria or null parameter (Qiang)
 BUG: Ticket#670 - TDatePicker: Year Issue (Christophe)
-BUG: Ticket#648 - Validation: onClick and onBlur events order (Christophe)
 ENH: Ticket#577 - Added image button support for TPager (Qiang)
 ENH: Ticket#623 - TMemCache to support multiple servers (Carl)
@@ -13 +13 @@
 ENH: Added THead requirement check (Qiang)
 CHG: GeSHi is replaced with Text_Highlighter (Christophe)
+CHG: Validators will not validate disabled controls (Qiang)
 NEW: Added TTabPanel (Qiang)
 NEW: Ticket#676 - Added primilary Oracle support (Christophe)

trunk/framework/Web/Javascripts/source/prado/validator/validation3.js

@@ -626 +626 @@
                 if(this.message)
                 {
-                        if(this.options.Display == "Dynamic") 
+                        if(this.options.Display == "Dynamic")
                         {
                                 var msg=this.message;
@@ -685 +685 @@
                         this.control = $(this.options.ControlToValidate);
 
-                if(!this.control)
+                if(!this.control || this.control.disabled)
                 {
                         this.isValid = true;

trunk/framework/Web/UI/WebControls/TBaseValidator.php

@@ -486 +486 @@
                 if($this->getVisible(true) && $this->getEnabled(true))
                 {
-                        if($this->getValidationTarget())
+                        // if the target is not a disabled web control
+                        if(($target=$this->getValidationTarget())!==null && !($target instanceof TWebControl && !$target->getEnabled(true)))
                         {
                                 if($this->evaluateIsValid())