Index: openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl,v diff -u -r1.9.6.3 -r1.9.6.4 --- openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl 30 May 2017 14:29:58 -0000 1.9.6.3 +++ openacs-4/packages/acs-subsite/www/admin/host-node-map/index.tcl 30 May 2017 17:16:50 -0000 1.9.6.4 @@ -4,6 +4,7 @@ @creation-date 2000-10-24 @cvs-id $Id$ } { + {parent_node_id:naturalnum ""} } set page_title [_ acs-subsite.Host_Node_Map] @@ -39,13 +40,23 @@ set delete_url [export_vars -base delete {host node_id}] } + +if {$parent_node_id eq ""} { + set parent_node_id [site_node::get_node_id -url "/"] +} + set node_list [list] -foreach node_id [site_node::get_children -all -element node_id -node_id [site_node::get_node_id -url "/"]] { - lappend node_list [list [site_node::get_element -node_id $node_id -element url] $node_id] +foreach node_id [site_node::get_children -element node_id -node_id $parent_node_id] { + set has_children_p [expr {[site_node::get_children -element node_id -node_id $node_id] ne ""}] + set url [site_node::get_element -node_id $node_id -element url] + if {$has_children_p} { + set url "$url" + } + lappend node_list [list $url $node_id] } -set sorted_node_list [lsort $node_list] +set sorted_node_list [lsort -dictionary $node_list] -ad_form -name add_host_node_mapping -form { +ad_form -name add_host_node_mapping -export {parent_node_id} -form { {host:text(text) {label "[_ acs-subsite.Hostname]"} {html {size 40}}