Index: openacs-4/packages/xowiki/www/admin/list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/xowiki/www/admin/list.tcl 17 Nov 2006 21:26:24 -0000 1.6 +++ openacs-4/packages/xowiki/www/admin/list.tcl 29 Dec 2006 11:01:36 -0000 1.7 @@ -64,6 +64,9 @@ -height 8 -border 0 -title "Toggle Publish Status" \ -alt "publish status" -label [_ xowiki.publish_status] -html {style "padding: 2px;"} } + if {[::xo::has_ltree]} { + AnchorField page_order -label [_ xowiki.order] -orderby page_order + } AnchorField name -label [_ xowiki.name] -orderby name Field object_type -label [_ xowiki.page_type] -orderby object_type Field size -label "Size" -orderby size -html {align right} @@ -83,7 +86,9 @@ [$object_type instance_select_query \ -folder_id [::$package_id folder_id] \ -with_subtypes $with_subtypes \ - -select_attributes [list revision_id content_length creation_user \ + -from_clause ", xowiki_page P" \ + -where_clause "P.page_id = cr.revision_id" \ + -select_attributes [list revision_id content_length creation_user page_order \ "to_char(last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified"] \ -order_clause $order_clause \ ] { @@ -99,8 +104,7 @@ -mod_user [::xo::get_user_name $creation_user] \ -delete.href [export_vars -base [$package_id package_url] {{delete 1} item_id name return_url}] if {$::individual_permissions} { - # TODO: this should get some architectural support - [lindex [t1 set __children] end] set permissions.href \ + [t1 last_child] set permissions.href \ [export_vars -base permissions {item_id return_url}] } if {$::with_publish_status} { @@ -112,11 +116,14 @@ set image inactive.png set state "ready" } - [lindex [t1 set __children] end] set publish_status.src /resources/xowiki/$image - [lindex [t1 set __children] end] set publish_status.href \ + [t1 last_child] set publish_status.src /resources/xowiki/$image + [t1 last_child] set publish_status.href \ [export_vars -base [$package_id package_url]admin/set-publish-state \ {state revision_id return_url}] } + if {[::xo::has_ltree]} { + [t1 last_child] set page_order $page_order + } } set t1 [t1 asHTML]