Merge from 3.0 branch till 1115.

2 files changed, 6 insertions, 3 deletions

diff --git a/demos/blog/protected/Pages/Admin/PostMan.page b/demos/blog/protected/Pages/Admin/PostMan.page
index 8ba8ef29..68ac44f8 100644
--- a/demos/blog/protected/Pages/Admin/PostMan.page
+++ b/demos/blog/protected/Pages/Admin/PostMan.page
@@ -43,7 +43,9 @@
 		<%#

 			$this->Parent->DataItem->Status===0 ?

 				'Published' :

-				($this->Parent->DataItem->Status===1 ? 'Draft' : 'Pending')

+				($this->Parent->DataItem->Status===1 ?

+					'Draft' :

+					($this->Parent->DataItem->Status===2 ? 'Pending' : 'Sticky'))

 		%>

 		</prop:ItemTemplate>

 		<prop:EditItemTemplate>

@@ -51,13 +53,14 @@
 			<com:TListItem Value="0" Text="Published" />

 			<com:TListItem Value="1" Text="Draft" />

 			<com:TListItem Value="2" Text="Pending" />

+			<com:TListItem Value="3" Text="Sticky" />

 		</com:TDropDownList>

 		</prop:EditItemTemplate>

 	</com:TTemplateColumn>

 	<com:TBoundColumn

 		HeaderText="Time"

 		ReadOnly="true"

-		DataField="CreateTime"

+		DataField="ModifyTime"

 		DataFormatString="#date('M j, Y',{0})"

 		ItemStyle.Wrap="false"

 		ItemStyle.Width="90px"

diff --git a/demos/blog/protected/Pages/Admin/PostMan.php b/demos/blog/protected/Pages/Admin/PostMan.php
index 349278fc..09c1809c 100644
--- a/demos/blog/protected/Pages/Admin/PostMan.php
+++ b/demos/blog/protected/Pages/Admin/PostMan.php
@@ -23,7 +23,7 @@ class PostMan extends BlogPage
 	{

 		$offset=$this->PostGrid->CurrentPageIndex*$this->PostGrid->PageSize;

 		$limit=$this->PostGrid->PageSize;

-		$this->PostGrid->DataSource=$this->DataAccess->queryPosts('','','ORDER BY a.status DESC, create_time DESC',"LIMIT $offset,$limit");

+		$this->PostGrid->DataSource=$this->DataAccess->queryPosts('','','ORDER BY a.status DESC, modify_time DESC',"LIMIT $offset,$limit");

 		$this->PostGrid->VirtualItemCount=$this->DataAccess->queryPostCount('','');

 		$this->PostGrid->dataBind();

 	}