Index: openacs-4/packages/project-manager/lib/categories-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/categories-portlet.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/project-manager/lib/categories-portlet.adp	26 May 2005 09:34:27 -0000	1.1
+++ openacs-4/packages/project-manager/lib/categories-portlet.adp	17 Jun 2005 09:49:20 -0000	1.2
@@ -1,4 +1,4 @@
-  <if @cat_length@ gt 0>
+  <if @categories:rowcount@ gt 0>
     <master src="/packages/project-manager/lib/portlet" />
     <property name="portlet_title">#project-manager.Categories#</property>
     <tr>
@@ -7,9 +7,13 @@
 	  <tr>
 	    <td class="fill-list-bg">
 	      <ul>
-		<list name="categories">
-		  <li> @categories:item@
-		</list>
+                <multiple name="categories">
+                  <li>@categories.tree_name@:
+                    <group column="tree_id" delimiter=", ">
+                      @categories.category_name@
+                    </group>
+                  </li>
+                </multiple>
 	      </ul>
 	    </td>
 	</table>
Index: openacs-4/packages/project-manager/lib/categories-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/project-manager/lib/categories-portlet.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/project-manager/lib/categories-portlet.tcl	6 Jun 2005 07:56:13 -0000	1.2
+++ openacs-4/packages/project-manager/lib/categories-portlet.tcl	17 Jun 2005 09:49:20 -0000	1.3
@@ -9,9 +9,15 @@
 
 # categories
 
-set categories [list]
+set cat_trees [list]
 set cat_list [category::get_mapped_categories $item_id]
 foreach cat $cat_list {
-    lappend categories [category::get_name $cat]
+    set tree_id [category::get_tree $cat]
+    lappend cat_trees [list [category_tree::get_name $tree_id] [category::get_name $cat] $tree_id]
 }
-set cat_length [llength $categories]
+
+multirow create categories tree_id tree_name category_name
+foreach cat [lsort -dictionary -index 0 $cat_trees] {
+    util_unlist $cat tree_name cat_name tree_id
+    multirow append categories $tree_id $tree_name $cat_name
+}