Index: openacs-4/packages/xowiki/www/portlets/categories-recent.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/categories-recent.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/xowiki/www/portlets/categories-recent.tcl 19 Jun 2006 00:40:04 -0000 1.6 +++ openacs-4/packages/xowiki/www/portlets/categories-recent.tcl 17 Aug 2006 01:44:26 -0000 1.7 @@ -8,12 +8,11 @@ # skin: name of adp-file to render content ::xowiki::Page proc __render_html { - -folder_id + -package_id -max_entries -tree_name } { set cattree [::xowiki::CatTree new -volatile -name "categories-recent"] - set package_id [$folder_id set package_id] foreach tree [category_tree::get_mapped_trees $package_id] { foreach {tree_id my_tree_name ...} $tree {break} @@ -30,7 +29,7 @@ "select c.category_id, i.name, r.title, \ to_char(r.publish_date,'YYYY-MM-DD HH24:MI:SS') as publish_date \ from category_object_map_tree c, cr_items i, cr_revisions r, xowiki_page p \ - where c.object_id = i.item_id and i.parent_id = $folder_id \ + where c.object_id = i.item_id and i.parent_id = [$package_id folder_id] \ and r.revision_id = i.live_revision \ and p.page_id = r.revision_id $tree_select_clause \ order by r.publish_date desc limit $max_entries @@ -42,6 +41,7 @@ foreach var {name title prefix suffix} {$itemobj set $var [set $var]} if {![info exists categories($category_id)]} { set categories($category_id) [::xowiki::Category new \ + -package_id $package_id \ -label [category::get_name $category_id]\ -level 1] $cattree add $categories($category_id) @@ -54,7 +54,7 @@ set content [::xowiki::Page __render_html \ -max_entries [expr {[info exists max_entries] ? $max_entries : 10}] \ -tree_name [expr {[info exists tree_name] ? $tree_name : ""}] \ - -folder_id [$__including_page set parent_id] \ + -package_id [$__including_page set package_id] \ ] if {![info exists name]} {set name "Recently Changed Pages by Categories"} set link ""