Fix TActiveCheckBoxList, TActiveRadioButtonList

3 files changed, 24 insertions, 5 deletions

diff --git a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
index b471a300..3e8ec309 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/activecontrols3.js
@@ -52,16 +52,15 @@ Prado.WebUI.TActiveRadioButton = jQuery.klass(Prado.WebUI.TActiveCheckBox);
 
 Prado.WebUI.TActiveCheckBoxList = jQuery.extend(
 {
-	constructor : function(options)
+	onInit : function(options)
 	{
-		Prado.Registry[options.ListID] = this;
 		for(var i = 0; i<options.ItemCount; i++)
 		{
-			var checkBoxOptions = jQuery.extend(
+			var checkBoxOptions = jQuery.extend({}, options,
 			{
-				ID : options.ListID+"_c"+i,
+				ID : options.ID+"_c"+i,
 				EventTarget : options.ListName+"$c"+i
-			}, options);
+			});
 			new Prado.WebUI.TActiveCheckBox(checkBoxOptions);
 		}
 	}
diff --git a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
index aa2d5f94..9d42862e 100644
--- a/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
+++ b/framework/Web/UI/ActiveControls/TActiveCheckBoxList.php
@@ -115,5 +115,14 @@ class TActiveCheckBoxList extends TCheckBoxList implements IActiveControl, ICall
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}
 
+	/**
+	 * Gets the name of the javascript class responsible for performing postback for this control.
+	 * This method overrides the parent implementation.
+	 * @return string the javascript class name
+	 */
+	protected function getClientClassName()
+	{
+		return 'Prado.WebUI.TActiveCheckBoxList';
+	}
 }
 
diff --git a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
index 5c76aed1..17e0b431 100644
--- a/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
+++ b/framework/Web/UI/ActiveControls/TActiveRadioButtonList.php
@@ -115,5 +115,16 @@ class TActiveRadioButtonList extends TRadioButtonList implements IActiveControl,
 		$this->getActiveControl()->registerCallbackClientScript(
 			$this->getClientClassName(), $this->getPostBackOptions());
 	}
+
+	/**
+	 * Gets the name of the javascript class responsible for performing postback for this control.
+	 * This method overrides the parent implementation.
+	 * @return string the javascript class name
+	 */
+	protected function getClientClassName()
+	{
+		return 'Prado.WebUI.TActiveRadioButtonList';
+	}
+
 }