Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

6 files changed, 220 insertions, 0 deletions

diff --git a/tests/FunctionalTests/issues/protected/pages/Issue504.page b/tests/FunctionalTests/issues/protected/pages/Issue504.page
new file mode 100755
index 00000000..ed29b358
--- /dev/null
+++ b/tests/FunctionalTests/issues/protected/pages/Issue504.page
@@ -0,0 +1,14 @@
+ <com:TContent ID="Content">
+ 	<h1>Issue 504 Test</h1>
+
+    <com:TPanel ID="dlg" DefaultButton="subPanel.buttonOk" >
+    <com:TTextBox ID="textbox1" />
+    <com:TButton ID="buttonDummy" OnCommand="buttonDummyClick" Text="Dummy button" />
+    Panel Content
+    <com:TLabel ID="label1" />
+    <com:TPanel ID="subPanel" >
+        <com:TButton ID="buttonOk" OnCommand="buttonOkClick" Text="Ok button" />
+    </com:TPanel>
+    </com:TPanel>
+ </com:TContent>
+
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue504.php b/tests/FunctionalTests/issues/protected/pages/Issue504.php
new file mode 100755
index 00000000..dd12c960
--- /dev/null
+++ b/tests/FunctionalTests/issues/protected/pages/Issue504.php
@@ -0,0 +1,14 @@
+<?php
+
+class Issue504 extends TPage
+{
+	function buttonOkClick($sender, $param)
+	{
+		$this->label1->Text="buttonOkClick";
+	}
+
+	function buttonDummyClick($sender, $param)
+	{
+		$this->label1->Text="buttonDummyClick";
+	}
+}
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.page b/tests/FunctionalTests/issues/protected/pages/Issue516.page
new file mode 100644
index 00000000..c922c6e1
--- /dev/null
+++ b/tests/FunctionalTests/issues/protected/pages/Issue516.page
@@ -0,0 +1,50 @@
+ <com:TContent ID="Content">
+
+<h1>Issue 516 Test</h1>
+
+<com:TActiveDataGrid
+	Width="800px"
+	CellPadding="2"
+	ID="DataGrid"
+	DataKeyField="ISBN"
+	AutoGenerateColumns="false"
+	HeaderStyle.BackColor="black"
+	HeaderStyle.ForeColor="white"
+	ItemStyle.BackColor="#BFCFFF"
+	ItemStyle.Font.Italic="true"
+	AlternatingItemStyle.BackColor="#E6ECFF"
+	EditItemStyle.BackColor="lightyellow"
+	OnEditCommand="editItem"
+	OnUpdateCommand="saveItem"
+	OnCancelCommand="cancelItem"
+	>
+	<com:TTemplateColumn
+		ID="BookTitleColumn"
+		HeaderText="Book Title"
+		HeaderStyle.Width="400px"
+	>
+		<prop:ItemTemplate>
+			<com:TLiteral Text="<%# $this->Parent->Data['title'] %>" Encode="true" />
+		</prop:ItemTemplate>
+		<prop:EditItemTemplate>
+			<com:TTextBox ID="TextBox" Text="<%# $this->Parent->Data['title'] %>" />
+			<com:TRequiredFieldValidator
+				ControlToValidate="TextBox"
+				Display="Dynamic"
+				ErrorMessage="<br/>Please provide a title."
+				ValidationGroup = "Group1"
+			/>
+		</prop:EditItemTemplate>
+	</com:TTemplateColumn>
+	<com:TActiveEditCommandColumn
+		HeaderText="Edit"
+		HeaderStyle.Width="100px"
+		UpdateText="Save"
+		ItemStyle.HorizontalAlign="Center"
+		ItemStyle.Font.Italic="false"
+		ValidationGroup = "Group1"
+		/>
+</com:TActiveDataGrid>
+
+ </com:TContent>
+
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue516.php b/tests/FunctionalTests/issues/protected/pages/Issue516.php
new file mode 100644
index 00000000..bd3e7a72
--- /dev/null
+++ b/tests/FunctionalTests/issues/protected/pages/Issue516.php
@@ -0,0 +1,115 @@
+<?php
+
+Prado::using('System.Web.UI.ActiveControls.*');
+
+class Issue516 extends TPage
+{
+	private $_data=null;
+
+	protected function getData()
+	{
+		if($this->_data===null)
+			$this->loadData();
+		return $this->_data;
+	}
+
+	protected function loadData()
+	{
+		// We use viewstate keep track of data.
+		// In real applications, data should come from database using an SQL SELECT statement.
+		// In the following tabular data, field 'ISBN' is the primary key.
+		// All update and delete operations should come with an 'id' value in order to go through.
+		if(($this->_data=$this->getViewState('Data',null))===null)
+		{
+			$this->_data=array(
+				array(
+					'ISBN'=>'0596007124',
+					'title'=>'',
+				),
+				array(
+					'ISBN'=>'0201633612',
+					'title'=>'Design Patterns: Elements of Reusable Object-Oriented Software',
+				),
+				array(
+					'ISBN'=>'0321247140',
+					'title'=>'Design Patterns Explained : A New Perspective on Object-Oriented Design',
+				),
+				array(
+					'ISBN'=>'0201485672',
+					'title'=>'Refactoring: Improving the Design of Existing Code',
+				),
+				array(
+					'ISBN'=>'0321213351',
+					'title'=>'Refactoring to Patterns',
+				),
+				array(
+					'ISBN'=>'0735619670',
+					'title'=>'Code Complete',
+				),
+				array(
+					'ISBN'=>'0321278658 ',
+					'title'=>'Extreme Programming Explained : Embrace Change',
+				),
+			);
+			$this->saveData();
+		}
+	}
+
+	protected function saveData()
+	{
+		$this->setViewState('Data',$this->_data);
+	}
+
+	protected function updateBook($isbn,$title)
+	{
+		// In real applications, data should be saved to database using an SQL UPDATE statement
+		if($this->_data===null)
+			$this->loadData();
+		$updateRow=null;
+		foreach($this->_data as $index=>$row)
+			if($row['ISBN']===$isbn)
+				$updateRow=&$this->_data[$index];
+		if($updateRow!==null)
+		{
+			$updateRow['title']=$title;
+			$this->saveData();
+		}
+	}
+
+	public function onLoad($param)
+	{
+		parent::onLoad($param);
+		if(!$this->IsPostBack && !$this->IsCallBack)
+		{
+			$this->DataGrid->DataSource=$this->Data;
+			$this->DataGrid->dataBind();
+		}
+	}
+
+	public function editItem($sender,$param)
+	{
+		$this->DataGrid->EditItemIndex=$param->Item->ItemIndex;
+		$this->DataGrid->DataSource=$this->Data;
+		$this->DataGrid->dataBind();
+	}
+
+	public function saveItem($sender,$param)
+	{
+		$item=$param->Item;
+		$this->updateBook(
+			$this->DataGrid->DataKeys[$item->ItemIndex],    // ISBN
+			$item->BookTitleColumn->TextBox->Text           // title
+			);
+		$this->DataGrid->EditItemIndex=-1;
+		$this->DataGrid->DataSource=$this->Data;
+		$this->DataGrid->dataBind();
+	}
+
+	public function cancelItem($sender,$param)
+	{
+		$this->DataGrid->EditItemIndex=-1;
+		$this->DataGrid->DataSource=$this->Data;
+		$this->DataGrid->dataBind();
+	}
+
+}
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue524.page b/tests/FunctionalTests/issues/protected/pages/Issue524.page
new file mode 100755
index 00000000..08ac1814
--- /dev/null
+++ b/tests/FunctionalTests/issues/protected/pages/Issue524.page
@@ -0,0 +1,7 @@
+<com:TContent ID="Content">
+  <h1>Issue 524 Test</h1>
+    <com:TTextBox ID="textbox1" />
+    <com:TActiveButton ID="buttonOk" Text="Ok button" />
+      <com:TActiveCustomValidator ID="Validator" ControlToValidate="textbox1" OnServerValidate="validateText" Text="Input is invalid." />
+</com:TContent>
+
diff --git a/tests/FunctionalTests/issues/protected/pages/Issue524.php b/tests/FunctionalTests/issues/protected/pages/Issue524.php
new file mode 100755
index 00000000..851ff45a
--- /dev/null
+++ b/tests/FunctionalTests/issues/protected/pages/Issue524.php
@@ -0,0 +1,20 @@
+<?php
+
+Prado::using('System.Web.UI.ActiveControls.*');
+
+class Issue524 extends TPage
+{
+
+  public function __construct() {
+    Prado::getApplication()->getGlobalization()->setCharset('ISO-8859-1');
+    parent::__construct();
+  }
+
+  public function validateText($sender, $param)
+  {
+    $param->IsValid = false;
+    $iso8859text=iconv('utf-8', 'iso-8859-1', 'fünf');
+    $this->Validator->ErrorMessage = $iso8859text;
+  }
+
+}