Index: openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl	11 Mar 2004 23:37:41 -0000	1.3
+++ openacs-4/contrib/packages/portal/www/admin/add-applications-2.tcl	12 Mar 2004 04:54:04 -0000	1.4
@@ -13,11 +13,9 @@
 
 set package_id [ad_conn package_id]
 set node_id [site_node::get_node_id_from_object_id -object_id $package_id]
-set portals [db_list get_portals {}]
+set non_admin_portals [db_list get_non_admin_portals {}]
+set admin_portal_id [portal::get_admin_portal_id]
 
-# This needs rewriting!!!! Drive by portal datasources ... and have them mount
-# the package if needed ...
-
 db_transaction {
     foreach one_application $application {
 
@@ -34,28 +32,45 @@
                                    -package_key $one_application \
                                    -parent_node_id $node_id]
 
-            set datasources [db_list get_datasources {}]
+            set user_datasources [db_list get_user_datasources {}]
 
-            foreach portal $portals {
-                foreach datasource $datasources {
+            foreach non_admin_portal $non_admin_portals {
+                foreach user_datasource $user_datasources {
                     db_transaction {
                         set element_id [portal::element::new \
-                                           -portal_id $portal \
+                                           -portal_id $non_admin_portal \
                                            -state hidden \
-                                           -datasource_name $datasource]
+                                           -datasource_name $user_datasource]
 
                         portal::element::parameter::set_value \
                             -element_id $element_id \
                             -key package_id \
                             -value $application_id
 
                         portal::element::initialize \
-                          -datasource_name $datasource \
+                          -datasource_name $user_datasource \
                           -element_id $element_id
                     }
                 }
             }
 
+            set admin_datasources [db_list get_admin_datasources {}]
+            foreach admin_datasource $admin_datasources {
+                db_transaction {
+                    set element_id [portal::element::new \
+                                       -portal_id $admin_portal_id \
+                                       -datasource_name $admin_datasource]
+
+                    portal::element::parameter::set_value \
+                        -element_id $element_id \
+                        -key package_id \
+                        -value $application_id
+
+                    portal::element::initialize \
+                      -datasource_name $admin_datasource \
+                      -element_id $element_id
+                }
+            }
         }
 
     }