Merge from 3.0 branch till 1103

1 files changed, 24 insertions, 1 deletions

diff --git a/demos/blog/protected/Portlets/CategoryPortlet.php b/demos/blog/protected/Portlets/CategoryPortlet.php
index 9c2033aa..e0c417bb 100644
--- a/demos/blog/protected/Portlets/CategoryPortlet.php
+++ b/demos/blog/protected/Portlets/CategoryPortlet.php
@@ -1,13 +1,36 @@
 <?php

+/**

+ * CategoryPortlet class file

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

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

+ * @copyright Copyright &copy; 2006 PradoSoft

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

+ * @version $Revision: $  $Date: $

+ */

 

 Prado::using('Application.Portlets.Portlet');

 

+/**

+ * CategoryPortlet class

+ *

+ * @author Qiang Xue <qiang.xue@gmail.com>

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

+ * @copyright Copyright &copy; 2006 PradoSoft

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

+ */

 class CategoryPortlet extends Portlet

 {

 	public function onLoad($param)

 	{

 		parent::onLoad($param);

-		$this->CategoryList->DataSource=$this->Application->getModule('data')->queryCategories();

+		$cats=$this->Application->getModule('data')->queryCategories();

+		foreach($cats as $cat)

+		{

+			$cat->ID=$this->Service->constructUrl('Posts.ListPost',array('cat'=>$cat->ID));

+			$cat->Name.=' (' . $cat->PostCount .')';

+		}

+		$this->CategoryList->DataSource=$cats;

 		$this->CategoryList->dataBind();

 	}

 }