Index: openacs-4/packages/xowiki/tcl/category-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/category-procs.tcl,v diff -u -N -r1.11 -r1.12 --- openacs-4/packages/xowiki/tcl/category-procs.tcl 5 Jan 2007 12:11:02 -0000 1.11 +++ openacs-4/packages/xowiki/tcl/category-procs.tcl 14 May 2007 07:14:21 -0000 1.12 @@ -16,6 +16,9 @@ if {![my isobject $items]} { ::xo::OrderedComposite create $items if {[info exists orderby]} { + if {$orderby eq "page_order"} { + $items mixin add ::xo::OrderedComposite::IndexCompare + } set direction [expr {$increasing ? "increasing" : "decreasing"}] $items orderby -order $direction $orderby } Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v diff -u -N -r1.49 -r1.50 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 11 May 2007 11:49:20 -0000 1.49 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 14 May 2007 07:14:21 -0000 1.50 @@ -274,6 +274,7 @@ {-summary:boolean 0} {-locale ""} {-open_page ""} + {-order_items_by "title,asc"} {-category_ids ""} {-except_category_ids ""} }} @@ -351,17 +352,23 @@ } append content [$cattree(0) render -tree_style $tree_style] } else { + foreach {orderby direction} [split $order_items_by ,] break ;# e.g. "title,asc" + set increasing [expr {$direction eq "asc"}] + set order_column [expr {[::xo::db::has_ltree] ? ", p.page_order" : ""}] + #my log "--CAT $increasing $order_column" db_foreach [my qn get_pages] \ - "select ci.item_id, ci.name, ci.content_type, r.title, category_id from $sql" { + "select ci.item_id, ci.name, ci.content_type, r.title, category_id $order_column from $sql" { if {$title eq ""} {set title $name} set itemobj [Object new] set prefix "" set suffix "" - foreach var {name title prefix suffix} {$itemobj set $var [set $var]} + foreach var {name title prefix suffix page_order} {$itemobj set $var [set $var]} + $cattree(0) add_to_category \ -category $category($category_id) \ -itemobj $itemobj \ - -orderby title \ + -orderby $orderby \ + -increasing $increasing \ -open_item [expr {$item_id == $open_item_id}] } append content [$cattree(0) render -tree_style $tree_style]