Index: openacs-4/packages/assessment/www/asm-admin/index.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/index.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/index.xql	2 Feb 2005 19:04:46 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/index.xql	18 Aug 2005 17:33:42 -0000	1.3
@@ -5,10 +5,10 @@
       <querytext>
       
     select ci.item_id as assessment_id, cr.title
-    from cr_folders cf, cr_items ci, cr_revisions cr, as_assessments a
+    from cr_items ci, cr_revisions cr
     where cr.revision_id = ci.latest_revision
-    and a.assessment_id = cr.revision_id
-    and ci.parent_id = cf.folder_id and cf.package_id = :package_id
+    and ci.content_type = 'as_assessments'
+    and ci.parent_id = :folder_id
     order by cr.title
     
       </querytext>
@@ -18,12 +18,12 @@
 <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
+    from cr_items ci, cr_revisions cr
     where cr.revision_id = ci.latest_revision
-    and a.assessment_id = cr.revision_id
-    and ci.parent_id = cf.folder_id
+    and ci.content_type = 'as_assessments'
+    and ci.parent_id = :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
+    grantee_id=:user_id and privilege='admin')
     order by cr.title
     
       </querytext>