Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/categories/www/cadmin/tree-view.tcl	6 Jun 2005 09:43:47 -0000	1.12
+++ openacs-4/packages/categories/www/cadmin/tree-view.tcl	6 Nov 2008 15:50:44 -0000	1.13
@@ -8,6 +8,7 @@
     tree_id:integer,notnull
     {locale ""}
     object_id:integer,optional
+    ctx_id:integer,optional
 } -properties {
     page_title:onevalue
     tree_name:onevalue
@@ -31,9 +32,9 @@
 
 set page_title "Category Tree \"$tree_name\""
 if {[info exists object_id]} {
-    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base object-map {locale object_id}] "[_ categories.cadmin]"] $tree_name]
+    set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base object-map {locale object_id ctx_id}] "[_ categories.cadmin]"] $tree_name]
 } else {
-    set context_bar [list [list ".?[export_vars -no_empty {locale}]" "[_ categories.cadmin]"] $tree_name]
+    set context_bar [list [list ".?[export_vars -no_empty {locale ctx_id}]" "[_ categories.cadmin]"] $tree_name]
 }
 
 set can_write_p [permission::permission_p -object_id $tree_id -privilege category_tree_write]
@@ -47,7 +48,7 @@
     util_unlist $category category_id category_name deprecated_p level
     incr sort_key 10
 
-    template::multirow append one_tree $category_name $sort_key $category_id $deprecated_p $level [string repeat " " [expr ($level-1)*5]]
+    template::multirow append one_tree $category_name $sort_key $category_id $deprecated_p $level [string repeat " " [expr {($level-1)*5}]]
 }
 
 
@@ -58,18 +59,18 @@
 
 multirow extend one_tree usage_url add_url edit_url delete_url parent_url phase_in_url phase_out_url links_view_url synonyms_view_url
 multirow foreach one_tree {
-    set usage_url [export_vars -no_empty -base category-usage { category_id tree_id locale object_id }]
+    set usage_url [export_vars -no_empty -base category-usage { category_id tree_id locale object_id ctx_id}]
     if { $can_write_p } {
-	set add_url [export_vars -no_empty -base category-form { { parent_id $category_id } tree_id locale object_id }]
-	set edit_url [export_vars -no_empty -base category-form { category_id tree_id locale object_id }]
-	set delete_url [export_vars -no_empty -base category-delete { category_id tree_id locale object_id }]
-	set parent_url [export_vars -no_empty -base category-parent-change { category_id tree_id locale object_id }]
-	set links_view_url [export_vars -no_empty -base category-links-view { category_id tree_id locale object_id }]
-	set synonyms_view_url [export_vars -no_empty -base synonyms-view { category_id tree_id locale object_id }]
+	set add_url [export_vars -no_empty -base category-form { { parent_id $category_id} tree_id locale object_id ctx_id}]
+	set edit_url [export_vars -no_empty -base category-form { category_id tree_id locale object_id ctx_id}]
+	set delete_url [export_vars -no_empty -base category-delete { category_id tree_id locale object_id ctx_id}]
+	set parent_url [export_vars -no_empty -base category-parent-change { category_id tree_id locale object_id ctx_id}]
+	set links_view_url [export_vars -no_empty -base category-links-view { category_id tree_id locale object_id ctx_id}]
+	set synonyms_view_url [export_vars -no_empty -base synonyms-view { category_id tree_id locale object_id ctx_id}]
 	if { [template::util::is_true $deprecated_p] } {
-	    set phase_in_url [export_vars -no_empty -base category-phase-in { category_id tree_id locale object_id }]
+	    set phase_in_url [export_vars -no_empty -base category-phase-in { category_id tree_id locale object_id ctx_id}]
 	} else {
-	    set phase_out_url [export_vars -no_empty -base category-phase-out { category_id tree_id locale object_id }]
+	    set phase_out_url [export_vars -no_empty -base category-phase-out { category_id tree_id locale object_id ctx_id}]
 	}
     }
 }
@@ -139,13 +140,13 @@
 	"Update ordering" "tree-order-update" "Update ordering from values in list"
     }
     set actions [list \
-		     "Add root category" [export_vars -no_empty -base category-form { tree_id locale object_id }] "Add category at the root level" \
-		     "Copy tree" [export_vars -no_empty -base tree-copy { tree_id locale object_id }] "Copy categories from other tree" \
-		     "Delete tree" [export_vars -no_empty -base tree-delete { tree_id locale object_id }] "Delete this category tree" \
-		     "Applications" [export_vars -no_empty -base tree-usage { tree_id locale object_id }] "Applications using this tree"]
+		     "Add root category" [export_vars -no_empty -base category-form { tree_id locale object_id ctx_id}] "Add category at the root level" \
+		     "Copy tree" [export_vars -no_empty -base tree-copy { tree_id locale object_id ctx_id}] "Copy categories from other tree" \
+		     "Delete tree" [export_vars -no_empty -base tree-delete { tree_id locale object_id ctx_id}] "Delete this category tree" \
+		     "Applications" [export_vars -no_empty -base tree-usage { tree_id locale object_id ctx_id}] "Applications using this tree"]
 
     if { $can_grant_p } {
-	lappend actions "Permissions" [export_vars -no_empty -base permission-manage { tree_id locale object_id }] "Manage permissions for tree"
+	lappend actions "Permissions" [export_vars -no_empty -base permission-manage { tree_id locale object_id ctx_id}] "Manage permissions for tree"
     }
 
 }
@@ -156,6 +157,6 @@
     -key category_id \
     -actions $actions \
     -bulk_actions $bulk_actions \
-    -bulk_action_export_vars { tree_id locale object_id }
+    -bulk_action_export_vars { tree_id locale object_id ctx_id}
 
 ad_return_template