Index: openacs-4/packages/xowiki/www/portlets/categories.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/portlets/categories.tcl 28 Jan 2006 23:28:23 -0000 1.3 +++ openacs-4/packages/xowiki/www/portlets/categories.tcl 9 Feb 2006 22:53:04 -0000 1.4 @@ -19,16 +19,19 @@ foreach {category_id category_label deprecated_p level} $category {break} set cat_content "" db_foreach get_pages \ - "select i.item_id, r.title, i.content_type from category_object_map c, cr_items i, cr_revisions r \ + "select i.item_id, r.title, i.content_type, p.page_title \ + from category_object_map c, cr_items i, cr_revisions r, xowiki_page p \ where c.object_id = i.item_id and i.parent_id = $folder_id \ and category_id = $category_id \ and r.revision_id = i.live_revision \ + and p.page_id = r.revision_id \ " { + if {$page_title eq ""} { set page_title $title} if {![::xotcl::Object isclass $content_type]} { # we could check for certain page types as well continue } - append cat_content "$title
\n" + append cat_content "$page_title
\n" } if {$cat_content ne ""} { append content "

$category_label

" $cat_content "
\n"