diff options
| author | emkael <emkael@tlen.pl> | 2016-10-25 16:03:16 +0200 |
|---|---|---|
| committer | emkael <emkael@tlen.pl> | 2016-10-25 16:03:16 +0200 |
| commit | 6edff35cd3315df12c0b41986eadbf29de8a67b2 (patch) | |
| tree | aecd048463766904c3a9a3502cf6a328c7bc18d2 /lib/prado/framework/Web/UI | |
| parent | 817ac4550e149c91f007417cb43dcc80d28dbd5d (diff) | |
* Prado bumped to v3.3.2
Diffstat (limited to 'lib/prado/framework/Web/UI')
4 files changed, 8 insertions, 5 deletions
diff --git a/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php index 0435041..4d7d8dc 100755 --- a/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php +++ b/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php @@ -36,6 +36,8 @@ Prado::using('System.Web.UI.WebControls.TFileUpload'); * a status icon is displayed; either a green checkmark if the upload is successful, * or a red x if there was an error. * + * TActiveFileUpload needs either an application level cache or a security manager to work securely. + * * @author Bradley Booms <Bradley.Booms@nsighttel.com> * @author Christophe Boulain <Christophe.Boulain@gmail.com> * @package System.Web.UI.ActiveControls diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php b/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php index 7feac4f..ea91f15 100644 --- a/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php +++ b/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php @@ -11,6 +11,7 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter'); Prado::using('System.Web.UI.JuiControls.TJuiControlOptions'); +Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter'); /** * TJuiControlAdapter class diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php index cd349f1..3c5e351 100644 --- a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php +++ b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php @@ -82,7 +82,7 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand */ public function getValidOptions() { - return array('appendTo', 'autoOpen', 'buttons', 'closeOnEscape', 'closeText', 'dialogClass', 'draggable', 'height', 'hide', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth', 'modal', 'position', 'resizeable', 'show', 'title', 'width'); + return array('appendTo', 'autoOpen', 'buttons', 'closeOnEscape', 'closeText', 'dialogClass', 'draggable', 'height', 'hide', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth', 'modal', 'position', 'resizable', 'show', 'title', 'width'); } /** @@ -100,6 +100,9 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand protected function getPostBackOptions() { $options = $this->getOptions()->toArray(); + // always make the dialog a child of the form, or its inner inputs won't be collected + if(!isset($options['appendTo'])) + $options['appendTo'] = 'form:first'; foreach($this->getControls() as $control) if($control instanceof TJuiDialogButton) diff --git a/lib/prado/framework/Web/UI/TControl.php b/lib/prado/framework/Web/UI/TControl.php index 1b8a213..caf0e0c 100644 --- a/lib/prado/framework/Web/UI/TControl.php +++ b/lib/prado/framework/Web/UI/TControl.php @@ -795,10 +795,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable if($this->_trackViewState) { unset($this->_tempState[$key]); - if($value===$defaultValue) - unset($this->_viewState[$key]); - else - $this->_viewState[$key]=$value; + $this->_viewState[$key]=$value; } else { |