Index: openacs-4/packages/acs-subsite/lib/subsites.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/subsites.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-subsite/lib/subsites.tcl	2 Oct 2003 21:18:11 -0000	1.2
+++ openacs-4/packages/acs-subsite/lib/subsites.tcl	2 Oct 2003 22:04:46 -0000	1.3
@@ -6,8 +6,6 @@
     set pretty_plural "subcommunities"
 }
 
-set user_id [ad_conn user_id]
-
 set admin_p [permission::permission_p -object_id [ad_conn package_id] -privilege admin]
 if { $admin_p } {
     set add_url "[subsite::get_element -element url]admin/subsite-add"
@@ -17,11 +15,10 @@
 list::create \
     -name subsites \
     -multirow subsites \
-    -key node_id \
     -elements {
         instance_name {
             label "Name"
-            link_url_eval {$name/}
+            link_url_col url
         }
         num_members {
             label "\# Members"
@@ -30,26 +27,20 @@
     }
 
 
-
-# Get the subsite node ID
-set subsite_url [site_node_closest_ancestor_package_url]
-array set subsite_sitenode [site_node::get -url $subsite_url]
-set subsite_node_id $subsite_sitenode(node_id)
-
 set subsites [list]
 set package_ids [list]
 
-foreach url [site_node::get_children -package_type apm_service -node_id $subsite_node_id] {
+foreach url [site_node::get_children -package_key acs-subsite -node_id [subsite::get_element -element node_id]] {
     array unset node 
     array set node [site_node::get_from_url -url $url -exact]
 
-    if { [string equal $node(package_key) "acs-subsite"] } { 
+    if { [permission::permission_p -object_id $node(object_id) -privilege read] } {
         lappend subsites [list \
                               $node(instance_name) \
                               $node(node_id) \
                               $node(name) \
                               $node(object_id) \
-                              [permission::permission_p -object_id $node(object_id) -privilege read]]
+                              $node(url)]
         lappend package_ids $node(object_id)
     }
 }
@@ -72,7 +63,7 @@
 # Sort them by instance_name
 set subsites [lsort -index 0 $subsites]
 
-multirow create subsites instance_name node_id name package_id read_p num_members
+multirow create subsites instance_name node_id name package_id url num_members
 
 foreach elm $subsites {
     set package_id [lindex $elm 3]