Index: openacs-4/packages/dotlrn-homework/www/file-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/file-postgresql.xql,v diff -u -r1.1.1.1 -r1.1.1.1.2.1 --- openacs-4/packages/dotlrn-homework/www/file-postgresql.xql 17 Feb 2003 20:56:17 -0000 1.1.1.1 +++ openacs-4/packages/dotlrn-homework/www/file-postgresql.xql 26 Feb 2003 02:37:40 -0000 1.1.1.1.2.1 @@ -5,15 +5,20 @@ - - select person__name(o.creation_user) as owner, - i.name as title, - r.title as name, - acs_permission__permission_p(:file_id,:user_id,'write') as write_p - from acs_objects o, cr_revisions r, cr_items i - where o.object_id = :file_id - and i.item_id = o.object_id - and r.revision_id = i.live_revision + + select person__name(file.creation_user) as owner, + file.name, + acs_permission__permission_p(:file_id, :user_id, 'write') as write_file_p, + acs_permission__permission_p(:file_id, :user_id, 'delete') as delete_file_p, + case when cir.item_id is null then 'f' else 't' end as correction_file_p + from + (select i.name, i.item_id, o.creation_user + from acs_objects o, cr_revisions r, cr_items i + where o.object_id = :file_id + and i.item_id = o.object_id + and r.revision_id = i.live_revision) file + left join cr_item_rels cir on (cir.related_object_id = file.item_id) + @@ -26,7 +31,8 @@ r.mime_type as type, to_char(o.last_modified,'YYYY-MM-DD HH24:MI') as last_modified, r.description, - r.content_length as content_size + r.content_length as content_size, + acs_permission__permission_p(r.revision_id, :user_id, 'delete') as delete_p from acs_objects o, cr_revisions r, cr_items i where o.object_id = r.revision_id and r.item_id = i.item_id