Merge from 3.0 till 868.

2 files changed, 11 insertions, 11 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample1.page b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample1.page
index dee3a41c..25b7db81 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample1.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample1.page
@@ -26,7 +26,7 @@ Since the page is mainly for display and does not require user interactions, the
 

 <prop:FooterTemplate>

 <div style="font-weight:bold; text-align:center;">

-Total <%# $this->Parent->Parent->ItemCount %> products.

+Total <%# $this->Parent->ItemCount %> products.

 </div>

 </prop:FooterTemplate>

 

@@ -36,10 +36,10 @@ Total <%# $this->Parent->Parent->ItemCount %> products.
   <th>ID</th><th>Name</th><th>Quantity</th><th>Price</th>

 </tr>

 <tr>

-  <td align="right"><%#$this->Parent->DataItem['id'] %></td>

-  <td align="right"><%#$this->Parent->DataItem['name'] %></td>

-  <td align="right"><%#$this->Parent->DataItem['quantity'] %></td>

-  <td align="right">$<%#$this->Parent->DataItem['price'] %></td>

+  <td align="right"><%#$this->DataItem['id'] %></td>

+  <td align="right"><%#$this->DataItem['name'] %></td>

+  <td align="right"><%#$this->DataItem['quantity'] %></td>

+  <td align="right">$<%#$this->DataItem['price'] %></td>

 </tr>

 </table>

 </prop:ItemTemplate>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page
index 07980c49..4b484b21 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page
@@ -29,7 +29,7 @@
        Text=<%#$this->Parent->DataItem['id']%>

        CommandName="select"

        />

-  <%#$this->Parent->DataItem['name']%>

+  <%#$this->DataItem['name']%>

   </td>

   <td align="right">

   <com:TLinkButton

@@ -52,10 +52,10 @@
   <th>ID</th><th>Name</th><th>Quantity</th><th>Price</th>

 </tr>

 <tr>

-  <td align="right"><%#$this->Parent->DataItem['id'] %></td>

-  <td align="right"><%#$this->Parent->DataItem['name'] %></td>

-  <td align="right"><%#$this->Parent->DataItem['quantity'] %></td>

-  <td align="right">$<%#$this->Parent->DataItem['price'] %></td>

+  <td align="right"><%#$this->DataItem['id'] %></td>

+  <td align="right"><%#$this->DataItem['name'] %></td>

+  <td align="right"><%#$this->DataItem['quantity'] %></td>

+  <td align="right">$<%#$this->DataItem['price'] %></td>

 </tr>

 <tr>

   <td colspan="4" align="right">

@@ -77,7 +77,7 @@
 <table border="0" width="100%">

 <tr>

   <td align="right">ID</td>

-  <td><b><%#$this->Parent->DataItem['id']%></b></td>

+  <td><b><%#$this->DataItem['id']%></b></td>

 </tr>

 <tr>

   <td align="right">Name</td>