Index: openacs-4/contrib/packages/portal/www/admin/add-applications-2.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/portal/www/admin/add-applications-2.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/portal/www/admin/add-applications-2.xql	12 Feb 2004 21:31:21 -0000	1.2
+++ openacs-4/contrib/packages/portal/www/admin/add-applications-2.xql	12 Mar 2004 04:54:04 -0000	1.3
@@ -2,12 +2,13 @@
 
 <queryset>
 
-    <fullquery name="get_portals">
+    <fullquery name="get_non_admin_portals">
         <querytext>
 
-            select portal_id, party_id
+            select portal_id
             from portals
             where package_id = :package_id
+              and owner_id <> :package_id
 
         </querytext>
     </fullquery>
@@ -38,14 +39,27 @@
         </querytext>
     </fullquery>
 
-    <fullquery name="get_datasources">
+    <fullquery name="get_user_datasources">
         <querytext>
 
             select name
             from portal_datasources
             where application = :one_application
+              and admin_p = 'f'
 
         </querytext>
     </fullquery>
 
+
+    <fullquery name="get_admin_datasources">
+        <querytext>
+
+            select name
+            from portal_datasources
+            where application = :one_application
+              and admin_p = 't'
+
+        </querytext>
+    </fullquery>
+
 </queryset>