Index: openacs-4/packages/ae-portlet/www/ae-admin-portlet.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/www/ae-admin-portlet.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ae-portlet/www/ae-admin-portlet.xql	9 Jun 2005 05:54:36 -0000	1.1
+++ openacs-4/packages/ae-portlet/www/ae-admin-portlet.xql	31 Jan 2006 01:41:53 -0000	1.2
@@ -4,10 +4,13 @@
 <fullquery name="get_all_assessments">
       <querytext>
       
-    select ci.item_id as assessment_id, cr.title
-    from cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
-    where cr.revision_id = ci.latest_revision
-    and a.assessment_id = cr.revision_id
+    select ci.item_id as assessment_id, coalesce(cr2.title, cr.title) as title, ci.live_revision, ci.latest_revision
+    from cr_folders cf, cr_items ci
+    left join cr_revisions cr
+    on (cr.revision_id = ci.latest_revision)
+    left join cr_revisions cr2
+    on (cr2.revision_id = ci.live_revision), as_assessments a
+    where a.assessment_id = cr.revision_id
     and ci.parent_id = cf.folder_id and cf.package_id = :package_id
     order by cr.title
     
@@ -17,10 +20,13 @@
 
 <fullquery name="get_all_assessments_admin">
       <querytext>
-    select ci.item_id as assessment_id, cr.title
-    from cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
-    where cr.revision_id = ci.latest_revision
-    and a.assessment_id = cr.revision_id
+    select ci.item_id as assessment_id, coalesce(cr2.title, cr.title) as title, ci.live_revision, ci.latest_revision
+    from cr_folders cf, cr_items ci 
+    left join cr_revisions cr
+    on (cr.revision_id = ci.latest_revision)
+    left join cr_revisions cr2
+    on (cr2.revision_id = ci.live_revision), as_assessments a
+    where a.assessment_id = cr.revision_id
     and ci.parent_id = cf.folder_id
     and  ci.item_id in (select object_id from acs_permissions where 
     grantee_id=:user_id and privilege='admin') and cf.package_id = :package_id