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.34 -r1.35 --- openacs-4/packages/xowiki/www/admin/list.tcl 13 Sep 2012 16:05:32 -0000 1.34 +++ openacs-4/packages/xowiki/www/admin/list.tcl 27 Oct 2014 16:42:07 -0000 1.35 @@ -58,7 +58,7 @@ set ::individual_permissions [expr {[$package_id set policy] eq "::xowiki::policy3"}] set ::with_publish_status 1 -TableWidget t1 -volatile \ +TableWidget create t1 -volatile \ -actions $actions \ -columns { BulkAction objects -id name -actions { @@ -87,7 +87,7 @@ AnchorField delete -CSSclass delete-item-button -label "" ;#-html {onClick "return(confirm('#xowiki.delete_confirm#'));"} } -foreach {att order} [split $orderby ,] break +lassign [split $orderby ,] att order t1 orderby -order [expr {$order eq "asc" ? "increasing" : "decreasing"}] $att # -page_size 10 @@ -98,12 +98,12 @@ "to_char(last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified" ] set folder_id [::$package_id folder_id] -foreach i [db_list get_syndicated { +foreach i [xo::dc list get_syndicated { select s.object_id from syndication s, cr_items ci where s.object_id = ci.live_revision and ci.parent_id = :folder_id }] { set syndicated($i) 1 } -db_foreach instance_select \ +xo::dc foreach instance_select \ [$object_type instance_select_query \ -folder_id $folder_id \ -with_subtypes $with_subtypes \ @@ -116,7 +116,7 @@ set page_link [::$package_id pretty_link -parent_id $parent_id $name] set name [::$package_id external_name -parent_id $parent_id $name] - t1 add \ + ::template::t1 add \ -name $name \ -title $title \ -object_type [string map [list "::xowiki::" ""] $object_type] \ @@ -131,8 +131,9 @@ -delete "" \ -delete.href [export_vars -base [$package_id package_url] {{delete 1} item_id name return_url}] \ -delete.title #xowiki.delete# + if {$::individual_permissions} { - [t1 last_child] set permissions.href \ + [::template::t1 last_child] set permissions.href \ [export_vars -base permissions {item_id return_url}] } if {$::with_publish_status} { @@ -144,12 +145,12 @@ set image inactive.png set state "ready" } - [t1 last_child] set publish_status.src /resources/xowiki/$image - [t1 last_child] set publish_status.href \ + [::template::t1 last_child] set publish_status.src /resources/xowiki/$image + [::template::t1 last_child] set publish_status.href \ [export_vars -base [$package_id package_url]admin/set-publish-state \ {state revision_id return_url}] } - [t1 last_child] set page_order $page_order + [::template::t1 last_child] set page_order $page_order } set t1 [t1 asHTML]