From 3261f4dcadf1e7aa45446153f654b20530c950b9 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Wed, 9 May 2007 08:35:52 +0000
Subject: Update northwind db
---
.gitattributes | 3 ++-
demos/northwind-db/protected/pages/Home.page | 17 +++++++------
demos/northwind-db/protected/pages/Home.php | 28 ---------------------
.../protected/pages/NorthwindCrud.page | 10 ++++++++
.../northwind-db/protected/pages/NorthwindCrud.php | 28 +++++++++++++++++++++
demos/northwind-db/protected/pages/northwind.gif | Bin 25177 -> 36713 bytes
.../ActiveRecord/Scaffold/TScaffoldListView.php | 10 +++++---
7 files changed, 56 insertions(+), 40 deletions(-)
delete mode 100644 demos/northwind-db/protected/pages/Home.php
create mode 100644 demos/northwind-db/protected/pages/NorthwindCrud.page
create mode 100644 demos/northwind-db/protected/pages/NorthwindCrud.php
diff --git a/.gitattributes b/.gitattributes
index 38ae357b..d09bc815 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -901,7 +901,8 @@ demos/northwind-db/protected/database/Supplier.php -text
demos/northwind-db/protected/database/Territory.php -text
demos/northwind-db/protected/database/sqlmap.xml -text
demos/northwind-db/protected/pages/Home.page -text
-demos/northwind-db/protected/pages/Home.php -text
+demos/northwind-db/protected/pages/NorthwindCrud.page -text
+demos/northwind-db/protected/pages/NorthwindCrud.php -text
demos/northwind-db/protected/pages/northwind.gif -text
demos/personal/index.php -text
demos/personal/protected/.htaccess -text
diff --git a/demos/northwind-db/protected/pages/Home.page b/demos/northwind-db/protected/pages/Home.page
index e2c3668e..ba88bb43 100644
--- a/demos/northwind-db/protected/pages/Home.page
+++ b/demos/northwind-db/protected/pages/Home.page
@@ -1,12 +1,13 @@
-
+
-Welcome to PRADO!
-
-
-
-
-
-
+Northwind Database Sample
+
+The Northwind Traders sample database contains the sales data for a fictitious
+company called Northwind Traders, which imports and exports specialty foods from around the world.
+The database contains information about customers, suppliers, products, orders and employees (as well as a few other bits of miscellaneous information).
+View database
+
+
/>
\ No newline at end of file
diff --git a/demos/northwind-db/protected/pages/Home.php b/demos/northwind-db/protected/pages/Home.php
deleted file mode 100644
index 06035069..00000000
--- a/demos/northwind-db/protected/pages/Home.php
+++ /dev/null
@@ -1,28 +0,0 @@
-getRecordClassList(Prado::getPathOfNamespace('Application.database.*'));
- $this->class_list->dataSource = $classes;
- $this->class_list->dataBind();
- }
-
- protected function getRecordClassList($directory)
- {
- $list=array();
- $folder=@opendir($directory);
- while($entry=@readdir($folder))
- {
- if($entry[0]==='.')
- continue;
- else if(is_file($directory.'/'.$entry))
- $list[] = str_replace('.php', '', $entry);
- }
- closedir($folder);
- return $list;
- }
-}
-
-?>
\ No newline at end of file
diff --git a/demos/northwind-db/protected/pages/NorthwindCrud.page b/demos/northwind-db/protected/pages/NorthwindCrud.page
new file mode 100644
index 00000000..34d8ecd0
--- /dev/null
+++ b/demos/northwind-db/protected/pages/NorthwindCrud.page
@@ -0,0 +1,10 @@
+
+
+
+Northwind Database
+
+
+
+
+
+
\ No newline at end of file
diff --git a/demos/northwind-db/protected/pages/NorthwindCrud.php b/demos/northwind-db/protected/pages/NorthwindCrud.php
new file mode 100644
index 00000000..57694caa
--- /dev/null
+++ b/demos/northwind-db/protected/pages/NorthwindCrud.php
@@ -0,0 +1,28 @@
+getRecordClassList(Prado::getPathOfNamespace('Application.database.*'));
+ $this->class_list->dataSource = $classes;
+ $this->class_list->dataBind();
+ }
+
+ protected function getRecordClassList($directory)
+ {
+ $list=array();
+ $folder=@opendir($directory);
+ while($entry=@readdir($folder))
+ {
+ if($entry[0]==='.')
+ continue;
+ else if(is_file($directory.'/'.$entry) && strpos($entry,'.php'))
+ $list[] = str_replace('.php', '', $entry);
+ }
+ closedir($folder);
+ return $list;
+ }
+}
+
+?>
\ No newline at end of file
diff --git a/demos/northwind-db/protected/pages/northwind.gif b/demos/northwind-db/protected/pages/northwind.gif
index 34e1f2ed..acbacaea 100644
Binary files a/demos/northwind-db/protected/pages/northwind.gif and b/demos/northwind-db/protected/pages/northwind.gif differ
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