Index: openacs-4/contrib/packages/project-manager/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-oracle.xql,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/contrib/packages/project-manager/www/index-oracle.xql	26 Oct 2004 02:58:47 -0000	1.1.2.2
+++ openacs-4/contrib/packages/project-manager/www/index-oracle.xql	14 Feb 2005 15:23:37 -0000	1.1.2.3
@@ -46,10 +46,13 @@
                         ctg.deprecated_p = 'f')
                  c ON p.item_id = c.object_id, 
         cr_items i, 
+	cr_folders f,
         pm_project_status s
         WHERE 
         p.project_id = i.live_revision and
         s.status_id           = p.status_id
+	and i.parent_id = f.folder_id
+        and f.package_id = :package_id 
         [template::list::filter_where_clauses -and -name projects]
         [template::list::orderby_clause -orderby -name projects]
     </querytext>
Index: openacs-4/contrib/packages/project-manager/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/index-postgresql.xql,v
diff -u -r1.12.2.1 -r1.12.2.2
--- openacs-4/contrib/packages/project-manager/www/index-postgresql.xql	2 Jul 2004 23:13:49 -0000	1.12.2.1
+++ openacs-4/contrib/packages/project-manager/www/index-postgresql.xql	14 Feb 2005 15:23:37 -0000	1.12.2.2
@@ -46,10 +46,13 @@
                         ctg.deprecated_p = 'f')
                  c ON p.item_id = c.object_id, 
         cr_items i, 
+	cr_folders f,
         pm_project_status s
         WHERE 
         p.project_id = i.live_revision and
         s.status_id           = p.status_id
+	and i.parent_id = f.folder_id
+        and f.package_id = :package_id 
         [template::list::filter_where_clauses -and -name projects]
         [template::list::orderby_clause -orderby -name projects]
     </querytext>
Index: openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/tasks-postgresql.xql,v
diff -u -r1.5.2.6 -r1.5.2.7
--- openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	20 Dec 2004 18:32:07 -0000	1.5.2.6
+++ openacs-4/contrib/packages/project-manager/www/tasks-postgresql.xql	14 Feb 2005 15:23:37 -0000	1.5.2.7
@@ -41,13 +41,16 @@
             LEFT JOIN pm_roles r
             ON ta.role_id = r.role_id,
         cr_items proj,
+	cr_folders f,
         pm_projectsx proj_rev
         WHERE
         ts.task_id  = t.item_id and
         i.item_id   = t.item_id and
         t.task_revision_id = i.live_revision and 
         t.parent_id = proj.item_id and
         proj.live_revision = proj_rev.revision_id
+	and proj.parent_id = f.folder_id
+        and f.package_id = :package_id 
         [template::list::filter_where_clauses -and -name tasks]
         [template::list::orderby_clause -orderby -name tasks]
     </querytext>