diff options
author | David <ottodavid@gmx.net> | 2015-08-10 19:50:41 +0200 |
---|---|---|
committer | David <ottodavid@gmx.net> | 2015-08-11 08:34:39 +0200 |
commit | 606874e9a883ae547df198498fce6fca7b735466 (patch) | |
tree | 2f9e772926ee22e715411e79acd8e0adfe1de2cd /framework/Web/UI/ActiveControls | |
parent | ac81ab6d556ce52e98acf636bbcd8ad4d60ecf4e (diff) |
Fix TProperyValue::ensureEnum and some unit tests class names
Diffstat (limited to 'framework/Web/UI/ActiveControls')
-rw-r--r-- | framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php | 6 | ||||
-rwxr-xr-x | framework/Web/UI/ActiveControls/TDraggable.php | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php b/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php index 60d5ab29..2d130917 100644 --- a/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php +++ b/framework/Web/UI/ActiveControls/TActiveEditCommandColumn.php @@ -36,12 +36,12 @@ use Prado\Web\UI\WebControls\TEditCommandColumn; class TActiveEditCommandColumn extends TEditCommandColumn { protected function createButton($commandName,$text,$causesValidation,$validationGroup) { if($this->getButtonType()===TButtonColumnType::LinkButton) - $button=Prado::createComponent('System.Web.UI.WebControls.TActiveLinkButton'); + $button=Prado::createComponent('System.Web.UI.ActiveControls.TActiveLinkButton'); else if($this->getButtonType()===TButtonColumnType::PushButton) - $button=Prado::createComponent('System.Web.UI.WebControls.TActiveButton'); + $button=Prado::createComponent('System.Web.UI.ActiveControls.TActiveButton'); else // image buttons { - $button=Prado::createComponent('System.Web.UI.WebControls.TActiveImageButton'); + $button=Prado::createComponent('System.Web.UI.ActiveControls.TActiveImageButton'); $button->setToolTip($text); if(strcasecmp($commandName,'Update')===0) $url=$this->getUpdateImageUrl(); diff --git a/framework/Web/UI/ActiveControls/TDraggable.php b/framework/Web/UI/ActiveControls/TDraggable.php index b4780eda..45344b27 100755 --- a/framework/Web/UI/ActiveControls/TDraggable.php +++ b/framework/Web/UI/ActiveControls/TDraggable.php @@ -80,7 +80,7 @@ class TDraggable extends TPanel $value=TDraggableRevertOptions::Revert; elseif (strcasecmp($value,'false')==0 || $value===false) $value=TDraggableRevertOptions::None; - $this->setViewState('Revert', TPropertyValue::ensureEnum($value, 'TDraggableRevertOptions'), true); + $this->setViewState('Revert', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\ActiveControls\\TDraggableRevertOptions'), true); } /** @@ -118,7 +118,7 @@ class TDraggable extends TPanel $value=TDraggableGhostingOptions::Ghosting; elseif (strcasecmp($value,'false')==0 || $value===false) $value=TDraggableGhostingOptions::None; - $this->setViewState('Ghosting', TPropertyValue::ensureEnum($value, 'TDraggableGhostingOptions'), TDraggableGhostingOptions::None); + $this->setViewState('Ghosting', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\ActiveControls\\TDraggableGhostingOptions'), TDraggableGhostingOptions::None); } /** @@ -136,7 +136,7 @@ class TDraggable extends TPanel */ public function setConstraint($value) { - $this->setViewState('Constraint', TPropertyValue::ensureEnum($value, 'TDraggableConstraint'), TDraggableConstraint::None); + $this->setViewState('Constraint', TPropertyValue::ensureEnum($value, 'Prado\\Web\\UI\\ActiveControls\\DraggableConstraint'), TDraggableConstraint::None); } /** |