Index: openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/project-manager/www/Attic/task-assign-add-edit-postgresql.xql,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql	12 Mar 2004 19:28:03 -0000	1.5.2.1
+++ openacs-4/contrib/packages/project-manager/www/task-assign-add-edit-postgresql.xql	20 May 2004 17:30:05 -0000	1.5.2.2
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <queryset>
+
   <fullquery name="get_task_info">
     <querytext>
       select
@@ -15,24 +16,39 @@
     </querytext>
   </fullquery>
 
+      select
+        title
+	FROM
+        pm_projects p, cr_revisions r, cr_items i
+        WHERE
+        r.item_id = :project_item_id and
+        i.item_id = r.item_id and
+        p.project_id = i.live_revision and
+        p.project_id = r.revision_id
+
   <fullquery name="get_more_task_info">
     <querytext>
       select
-        title as one_line,
-        description,
-        item_id,
-        to_char(end_date, 'YYYY-MM-DD HH24:MI:SS') as end_date_ansi,
-        estimated_hours_work,
-        estimated_hours_work_min,
-        estimated_hours_work_max,
-        to_char(earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi,
-        to_char(earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi,
-        to_char(latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi,
-        to_char(latest_finish, 'YYYY-MM-DD HH24:MI:SS') as latest_finish_ansi
+        t.title as one_line,
+        t.description,
+        t.item_id,
+        t.estimated_hours_work,
+        t.estimated_hours_work_min,
+        t.estimated_hours_work_max,
+        to_char(t.earliest_start, 'YYYY-MM-DD HH24:MI:SS') as earliest_start_ansi,
+        to_char(t.earliest_finish, 'YYYY-MM-DD HH24:MI:SS') as earliest_finish_ansi,
+        to_char(t.latest_start, 'YYYY-MM-DD HH24:MI:SS') as latest_start_ansi,
+        to_char(t.latest_finish, 'YYYY-MM-DD HH24:MI:SS') as
+          latest_finish_ansi,
+        proj_rev.title as project_name
 	FROM
-	pm_tasks_revisionsx t
+	pm_tasks_revisionsx t,
+        cr_items proj,
+        cr_revisions proj_rev
         WHERE
-        revision_id in ([join $revisions ","])
+        t.revision_id in ([join $revisions ","]) and
+        t.parent_id = proj.item_id and
+        proj.live_revision = proj_rev.revision_id
         ORDER BY
         item_id
     </querytext>
@@ -122,19 +138,4 @@
         process_task_id = :ptid
     </querytext>
   </fullquery>
-
-  <fullquery name="get_project_name">
-    <querytext>
-      select
-        title
-	FROM
-        pm_projects p, cr_revisions r, cr_items i
-        WHERE
-        r.item_id = :project_item_id and
-        i.item_id = r.item_id and
-        p.project_id = i.live_revision and
-        p.project_id = r.revision_id
-    </querytext>
-  </fullquery>
-
 </queryset>