Index: openacs-4/packages/categories/www/cadmin/object-map.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/object-map.tcl 28 Aug 2007 16:30:03 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/object-map.tcl 6 Nov 2008 15:50:44 -0000 1.4 @@ -8,10 +8,11 @@ @cvs-id $Id: } { object_id:integer,notnull + ctx_id:integer,optional {locale ""} } -properties { page_title:onevalue - context_bar:onevalue + context:onevalue locale:onevalue mapped_trees:multirow unmapped_trees:multirow @@ -23,21 +24,22 @@ set context_bar [category::get_object_context $object_id] set object_name [lindex $context_bar 1] -set page_title "Category Management" +set page_title [_ categories.cadmin] set context_bar [list $context_bar $page_title] -template::multirow create mapped_trees tree_name tree_id site_wide_p assign_single_p require_category_p widget view_url unmap_url edit_url +template::multirow create mapped_trees tree_name tree_id \ + site_wide_p assign_single_p require_category_p widget view_url unmap_url edit_url db_foreach get_mapped_trees "" { set tree_name [category_tree::get_name $tree_id $locale] if {![empty_string_p $subtree_category_id]} { - append tree_name " :: [category::get_name $subtree_category_id $locale]" + append tree_name " :: [category::get_name $subtree_category_id $locale]" } template::multirow append mapped_trees $tree_name $tree_id $site_wide_p \ $assign_single_p $require_category_p $widget \ - [export_vars -no_empty -base tree-view { tree_id locale object_id }] \ - [export_vars -no_empty -base tree-unmap { tree_id locale object_id }] \ - [export_vars -no_empty -base tree-map-2 { tree_id locale object_id {edit_p 1}}] + [export_vars -no_empty -base tree-view { tree_id locale object_id ctx_id}] \ + [export_vars -no_empty -base tree-unmap { tree_id locale object_id ctx_id}] \ + [export_vars -no_empty -base tree-map-2 { tree_id locale object_id {edit_p 1} ctx_id}] } template::multirow sort mapped_trees -dictionary tree_name @@ -49,9 +51,9 @@ set tree_name [category_tree::get_name $tree_id $locale] template::multirow append unmapped_trees $tree_id $tree_name $site_wide_p \ - [export_vars -no_empty -base tree-view { tree_id locale object_id }] \ - [export_vars -no_empty -base tree-map-2 { tree_id locale object_id }] \ - [export_vars -no_empty -base tree-map { tree_id locale object_id }] + [export_vars -no_empty -base tree-view { tree_id locale object_id ctx_id}] \ + [export_vars -no_empty -base tree-map-2 { tree_id locale object_id ctx_id}] \ + [export_vars -no_empty -base tree-map { tree_id locale object_id ctx_id}] } } @@ -104,6 +106,6 @@ } } -set create_url [export_vars -no_empty -base tree-form { locale }] +set create_url [export_vars -no_empty -base tree-form { locale object_id ctx_id }] ad_return_template