From 3261f4dcadf1e7aa45446153f654b20530c950b9 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Wed, 9 May 2007 08:35:52 +0000
Subject: Update northwind db

---
 framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'framework/Data')

diff --git a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
index f5121a44..851bf903 100644
--- a/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
+++ b/framework/Data/ActiveRecord/Scaffold/TScaffoldListView.php
@@ -77,8 +77,11 @@ class TScaffoldListView extends TScaffoldBase
 	public function onPreRender($param)
 	{
 		parent::onPreRender($param);
-		//if(!$this->getPage()->getIsPostBack())
-		$this->initializeSort();
+		if(!$this->getPage()->getIsPostBack() || $this->getViewState('CurrentClass')!=$this->getRecordClass())
+		{
+			$this->initializeSort();
+			$this->setViewState('CurrentClass', $this->getRecordClass());
+		}
 		$this->loadRecordData();
 	}
 
@@ -87,9 +90,10 @@ class TScaffoldListView extends TScaffoldBase
 	 */
 	protected function loadRecordData()
 	{
+		$search = new TActiveRecordCriteria($this->getSearchCondition(), $this->getSearchParameters());
+		$this->_list->setVirtualItemCount($this->getRecordFinder()->count($search));
 		$finder = $this->getRecordFinder();
 		$criteria = $this->getRecordCriteria();
-		$this->_list->setVirtualItemCount($this->getRecordFinder()->count($criteria));
 		$this->_list->setDataSource($finder->findAll($criteria));
 		$this->_list->dataBind();
 	}
-- 
cgit v1.2.3