Ensure rendering of clientID in TActivePanel

2 files changed, 31 insertions, 21 deletions

diff --git a/HISTORY b/HISTORY
index 4edce753..578ebd12 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,26 +1,27 @@
 Version 3.1.5 (to be released)
-BUG: URL wildcard patterns didn't work with subfolders
-ENH: Issue#146 - replace deprecated(php5.3>) split with explode in TPgsqlMetaData:getPrimaryKeys(), PradoBase::getUserLanguages() (Yves)
-BUG: TDbLogRoute::createDbTable: add AUTO_INCREMENT attribute to log_id column if driver is mysql (Yves)
-BUG/ENH: TSqlMapCacheModel now consider <flushInterval> tag as described in doc (sqlmap.pdf) - valid attributes are duration in sec or seconds, minutes, hours, days (Yves)
-BUG: Issue#88 - SQLMap $Param$ re-evaluation bug (Yves)
-BUG: Issue#120 - TActiveDropDownList PromptText and PromptValue got lost during callback and data rebind (Yves)
 BUG: Issue#68 - TSqlMapConfig::createSqlMapGateway(): assign current connection to cached TSqlMapManager to avoid loosing active transaction (Yves)
-BUG: Issue#108 - clientscripts.php: prepending set_time_limit(0) call with an "@" to suppress PHP warning in safe mode (Yves)
 BUG: Issue#87 - TinyMCE : empty string disapears after encoding JS, that's a problem! (Christophe)
+BUG: Issue#88 - SQLMap $Param$ re-evaluation bug (Yves)
 BUG: Issue#96 - THttpResponse::redirect don't send status code (Christophe)
 BUG: Issue#99 - TActiveRecord::save(): confusion with order of keys in table/index (Christophe)
+BUG: Issue#108 - clientscripts.php: prepending set_time_limit(0) call with an "@" to suppress PHP warning in safe mode (Yves)
 BUG: Issue#107 - typo in TDbConnection::getCharset() (Christophe)
+BUG: Issue#120 - TActiveDropDownList PromptText and PromptValue got lost during callback and data rebind (Yves)
 BUG: Issue#126 - THtmlArea: boolean options output as strings (Christophe)
 BUG: Issue#127 - TDataSourceConfig::findConnectionByID try to access private var (Cristophe)
 BUG: Issue#129 - TDbLogRoute::init don't close the sql command (Christophe)
 BUG: Issue#130 - TDbLogRoute::processLogs wrong values binding (Christophe)
 BUG: Issue#136 - TActiveDatePicker don't callback when ShowCalendar is false (Christophe)
-CHG: Issue#7 - Clients Scripts are not combined anymore in Debug application mode (Christophe)
+BUG: URL wildcard patterns didn't work with subfolders
+BUG: TDbLogRoute::createDbTable: add AUTO_INCREMENT attribute to log_id column if driver is mysql (Yves)
+BUG: Ensure rendering of clientID in TActivePanel (Christophe)
+BUG/ENH: TSqlMapCacheModel now consider <flushInterval> tag as described in doc (sqlmap.pdf) - valid attributes are duration in sec or seconds, minutes, hours, days (Yves)
+BUG/ENH: Issue#112 - TXmlDocument add support for namespaces: for backward compatibility only if SimpleXml installed (Yves)
 ENH: Issue#115 - Registry for Prado generated clientside counterparts of serverside controls (Yves Berkholz)
-ENH: Issue#135 - Add AutoPostBack property to TActiveFileUpload (Bradley)
 ENH: Issue#117 - TValidationSummary: new display mode "HeaderOnly" that only render value of HeaderText property (Yves)
-BUG/ENH: Issue#112 - TXmlDocument add support for namespaces: for backward compatibility only if SimpleXml installed (Yves)
+ENH: Issue#135 - Add AutoPostBack property to TActiveFileUpload (Bradley)
+ENH: Issue#146 - replace deprecated(php5.3>) split with explode in TPgsqlMetaData:getPrimaryKeys(), PradoBase::getUserLanguages() (Yves)
+CHG: Issue#7 - Clients Scripts are not combined anymore in Debug application mode (Christophe)
 ENH: Added caching of message files to TException (Michael)
 ENH: Updated to scriptaculous 1.8.2 & Prototype 1.6.0.3
 ENH: replace is_null() function calls with native language constuct (Yves)
diff --git a/framework/Web/UI/ActiveControls/TActivePanel.php b/framework/Web/UI/ActiveControls/TActivePanel.php
index 51e9fb08..25a42eb7 100644
--- a/framework/Web/UI/ActiveControls/TActivePanel.php
+++ b/framework/Web/UI/ActiveControls/TActivePanel.php
@@ -4,7 +4,7 @@
  *

  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI.ActiveControls

@@ -58,6 +58,15 @@ class TActivePanel extends TPanel implements IActiveControl
 	}

 

 	/**

+	 * Adds attribute id to the renderer.

+	 * @param THtmlWriter the writer used for the rendering purpose

+	 */

+	protected function addAttributesToRender($writer) {

+	    $writer->addAttribute('id',$this->getClientID());

+	    parent::addAttributesToRender($writer);

+	}

+

+	/**

 	 * Renders and replaces the panel's content on the client-side.

 	 * When render() is called before the OnPreRender event, such as when render()

 	 * is called during a callback event handler, the rendering

@@ -74,16 +83,16 @@ class TActivePanel extends TPanel implements IActiveControl
 		}

 		else

 		{

-			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);
-			if ($this->getHasControls())
-			{
-				// If we update a TActivePanel on callback,
-				// We shouldn't update all childs, because the whole content will be replaced by 
-				// the parent
-				foreach ($this->findControlsByType('IActiveControl', false) as $control)
-				{
-						$control->getActiveControl()->setEnableUpdate(false);
-				}
+			$this->getPage()->getAdapter()->registerControlToRender($this,$writer);

+			if ($this->getHasControls())

+			{

+				// If we update a TActivePanel on callback,

+				// We shouldn't update all childs, because the whole content will be replaced by 

+				// the parent

+				foreach ($this->findControlsByType('IActiveControl', false) as $control)

+				{

+						$control->getActiveControl()->setEnableUpdate(false);

+				}

 			}

 		}

 	}