Index: openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-one-postgresql.xql,v
diff -u -r1.22 -r1.23
--- openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	5 May 2004 19:04:55 -0000	1.22
+++ openacs-4/contrib/packages/project-manager/www/task-one-postgresql.xql	14 May 2004 23:08:57 -0000	1.23
@@ -1,21 +1,11 @@
 <?xml version="1.0"?>
 <queryset>
-  <fullquery name="get_project_ids">
-    <querytext>
-	SELECT
-        t.parent_id as project_item_id
-	FROM
-	pm_tasks_revisionsx t, cr_items i
-	WHERE
-        i.item_id = t.item_id and
-        t.revision_id = :task_revision_id
-    </querytext>
-  </fullquery>
 
   <fullquery name="task_query">
     <querytext>
 	SELECT
         t.item_id,
+        t.parent_id as project_item_id,
         t.title as task_title,
         t.description,
         t.mime_type,
@@ -32,16 +22,21 @@
         t.estimated_hours_work_max,
         t.percent_complete,
         i.live_revision,
-	p.first_names || ' ' || p.last_name as creation_user
+	p.first_names || ' ' || p.last_name as creation_user,
+        proj_rev.title as project_name
 	FROM
 	pm_tasks_revisionsx t, 
         cr_items i,
-        persons p
+        persons p,
+        cr_items proj,
+        cr_revisions proj_rev
 	WHERE
         t.item_id = :task_id and
         t.revision_id = :task_revision_id and
         t.item_id = i.item_id and
-        t.creation_user = p.person_id
+        t.creation_user = p.person_id and
+        t.parent_id = proj.item_id and
+        proj.live_revision = proj_rev.revision_id
     </querytext>
   </fullquery>