From deb44d4ca9cb18865c90de0878cbc27aa4ee6c56 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Wed, 11 Jan 2006 02:17:12 +0000
Subject: TRepeater nearly completed (test pending)

---
 framework/Web/UI/WebControls/TDataBoundControl.php  | 7 ++++++-
 framework/Web/UI/WebControls/TDataSourceControl.php | 9 ++++++---
 framework/Web/UI/WebControls/TDataSourceView.php    | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'framework/Web/UI/WebControls')

diff --git a/framework/Web/UI/WebControls/TDataBoundControl.php b/framework/Web/UI/WebControls/TDataBoundControl.php
index 399013a2..d02412e5 100644
--- a/framework/Web/UI/WebControls/TDataBoundControl.php
+++ b/framework/Web/UI/WebControls/TDataBoundControl.php
@@ -10,6 +10,9 @@
  * @package System.Web.UI.WebControls
  */
 
+Prado::using('System.Web.UI.WebControls.TDataSourceControl');
+Prado::using('System.Web.UI.WebControls.TDataSourceView');
+
 /**
  * TDataBoundControl class.
  *
@@ -35,6 +38,8 @@ abstract class TDataBoundControl extends TWebControl
 	private $_currentDataSource=null;
 	private $_currentViewValid=false;
 	private $_currentDataSourceValid=false;
+	private $_currentViewIsFromDataSourceID=false;
+	private $_parameters=null;
 
 	/**
 	 * @return Traversable data source object, defaults to null.
@@ -317,7 +322,7 @@ abstract class TDataBoundControl extends TWebControl
 			return $list;
 		}
 		else if(is_array($value))
-			$value=new TList($value);
+			return new TList($value);
 		else if(($value instanceof Traversable) || $value===null)
 			return $value;
 		else
diff --git a/framework/Web/UI/WebControls/TDataSourceControl.php b/framework/Web/UI/WebControls/TDataSourceControl.php
index f8944dbb..eaf39199 100644
--- a/framework/Web/UI/WebControls/TDataSourceControl.php
+++ b/framework/Web/UI/WebControls/TDataSourceControl.php
@@ -35,14 +35,17 @@ interface IDataSource
  */
 abstract class TDataSourceControl extends TControl implements IDataSource
 {
-	public function getView($viewName);
+	public function getView($viewName)
+	{
+		return null;
+	}
 
 	public function getViewNames()
 	{
 		return array();
 	}
 
-	protected function onDataSourceChanged($param)
+	public function onDataSourceChanged($param)
 	{
 		$this->raiseEvent('DataSourceChanged',$this,$param);
 	}
@@ -72,7 +75,7 @@ abstract class TDataSourceControl extends TControl implements IDataSource
 		throw new TNotSupportedException('datasourcecontrol_skinid_unsupported');
 	}
 
-	public function getVisible()
+	public function getVisible($checkParents=true)
 	{
 		return false;
 	}
diff --git a/framework/Web/UI/WebControls/TDataSourceView.php b/framework/Web/UI/WebControls/TDataSourceView.php
index a41555d1..ceed981f 100644
--- a/framework/Web/UI/WebControls/TDataSourceView.php
+++ b/framework/Web/UI/WebControls/TDataSourceView.php
@@ -96,7 +96,7 @@ abstract class TDataSourceView extends TComponent
 	 * @param ???
 	 * @return Traversable
 	 */
-	public function select($parameters);
+	abstract public function select($parameters);
 
 	/**
 	 * Inserts a DB record.
-- 
cgit v1.2.3