Index: openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 9 Jun 2015 07:26:38 -0000 1.8
+++ openacs-4/packages/acs-subsite/www/admin/site-map/site-map.tcl 27 Jun 2015 16:03:13 -0000 1.9
@@ -44,7 +44,7 @@
set javascript "onload=\"javascript:document.check_checkbox()\""
-set parent_link ".?[export_vars -url {expand:multiple {root_id $parent_id}}]"
+set parent_link [export_vars -base . {expand:multiple {root_id $parent_id}}]
set page_title "Build Your Site Map "
set context [list [list "." "Site Map"] $page_title]
@@ -53,7 +53,8 @@
db_foreach path_select {} {
if {$node_id != $root_id && $admin_p == "t"} {
- append head ""
+ set href [export_vars -base . {expand:multiple {root_id $node_id}}]
+ append head [subst {}]
}
if {$name eq ""} {
append head "$obj_name:"
@@ -185,31 +186,31 @@
if {$directory_p == "t"} {
set add_folder_url "?[export_vars -url {expand:multiple root_id node_id {new_parent $node_id} {new_type folder}}]"
if {$object_id eq ""} {
- set mount_url "mount?[export_vars -url {expand:multiple root_id node_id}]"
+ set mount_url [export_vars -base mount {expand:multiple root_id node_id}]
set new_app_url "?[export_vars -url {expand:multiple root_id {new_application $node_id}}]"
} else {
# This makes sure you can't unmount the thing that is serving the page you're looking at.
if {[ad_conn node_id] != $node_id} {
- set unmount_url "unmount?[export_vars -url {expand:multiple root_id node_id}]"
+ set unmount_url [export_vars -base unmount {expand:multiple root_id node_id}]
}
# Add a link to control permissioning
if {$object_admin_p} {
- set permissions_url "../../permissions/one?[export_vars -url {object_id}]"
+ set permissions_url [export_vars -base ../../permissions/one {object_id}]
set rename_url "?[export_vars -url {expand:multiple root_id {rename_application $node_id}}]"
set delete_url "instance-delete?package_id=$object_id&root_id=$root_id"
}
# Is the object a package?
if {$package_id ne ""} {
if {$object_admin_p && ($parameter_count > 0)} {
- set parameters_url "[export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]"
+ set parameters_url [export_vars -base "/shared/parameters" { package_id {return_url {[ad_return_url]} } }]
}
}
}
}
if {[ad_conn node_id] != $node_id && $n_children == 0 && $object_id eq ""} {
- set delete_url "delete?[export_vars -url {expand:multiple root_id node_id}]"
+ set delete_url [export_vars -base delete {expand:multiple root_id node_id}]
}
# use the indent variable to hold current indent level we'll use it later to indent stuff at the end by the amount of the last node
@@ -247,7 +248,7 @@
set expand_url ""
}
- set name_url [export_vars -url {expand:multiple {root_id $node_id}}]
+ set name_url [export_vars {expand:multiple {root_id $node_id}}]
set action_type 0
set action_form_part ""
@@ -265,15 +266,15 @@
}
} elseif {$rename_application == $node_id} {
set action_type "rename_app"
- set action_form_part "[export_vars -form {expand:multiple root_id node_id rename_package_id}]"
+ set action_form_part [export_vars -form {expand:multiple root_id node_id rename_package_id}]
} else {}
if {$node_id == $new_parent} {
set parent_id $new_parent
set node_type $new_type
set action_type "new_folder"
- set action_form_part "[export_vars -form {expand:multiple parent_id node_type root_id}]"
+ set action_form_part [export_vars -form {expand:multiple parent_id node_type root_id}]
}
multirow append nodes $node_id $expand_mode $expand_url $indent $name $name_url $object_name $url $package_pretty_name $action_type $action_form_part $add_folder_url $new_app_url $unmount_url $mount_url $rename_url $delete_url $parameters_url $permissions_url "" $view_p
@@ -290,7 +291,8 @@
db_foreach services_select {} {
if {$parameter_count > 0} {
- append services "$instance_name"
+ set href [export_vars -base "/shared/parameters" { package_id { return_url {[ad_return_url]} } }]
+ append services [subst {$instance_name}]
}
} if_no_rows {
append services " (none)\n"