Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	4 Mar 2002 18:26:03 -0000	1.8
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql	13 Mar 2002 21:17:12 -0000	1.9
@@ -46,7 +46,10 @@
                    fs_folders_and_files.live_revision,
                    fs_folders_and_files.type,
                    to_char(fs_folders_and_files.last_modified, 'YYYY-MM-DD HH24:MI') as last_modified,
-                   fs_folders_and_files.content_size
+                   fs_folders_and_files.content_size,
+                   decode(acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'write'), 'f', 0, 1) as write_p,
+                   decode(acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'delete'), 'f', 0, 1) as delete_p,
+                   decode(acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'admin'), 'f', 0, 1) as admin_p
             from fs_folders_and_files
             where fs_folders_and_files.parent_id = :folder_id
             and 't' = acs_permission.permission_p(fs_folders_and_files.file_id, :user_id, 'read')
Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	4 Mar 2002 18:26:03 -0000	1.15
+++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql	13 Mar 2002 21:17:12 -0000	1.16
@@ -38,7 +38,10 @@
                    fs_folders_and_files.live_revision,
                    fs_folders_and_files.type,
                    to_char(fs_folders_and_files.last_modified, 'YYYY-MM-DD HH24:MI') as last_modified,
-                   fs_folders_and_files.content_size
+                   fs_folders_and_files.content_size,
+                   case when acs_permission__permission_p(fs_folders_and_files, :user_id, 'write') = 'f' then 0 else 1 end as write_p,
+                   case when acs_permission__permission_p(fs_folders_and_files, :user_id, 'delete') = 'f' then 0 else 1 end as delete_p,
+                   case when acs_permission__permission_p(fs_folders_and_files, :user_id, 'admin') = 'f' then 0 else 1 end as admin_p
             from fs_folders_and_files
             where fs_folders_and_files.parent_id = :folder_id
             and 't' = acs_permission__permission_p(fs_folders_and_files.file_id, :user_id, 'read')
Index: openacs-4/packages/file-storage/www/folder-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/file-storage/www/folder-chunk.adp	22 Feb 2002 22:02:29 -0000	1.2
+++ openacs-4/packages/file-storage/www/folder-chunk.adp	13 Mar 2002 21:17:12 -0000	1.3
@@ -21,7 +21,8 @@
 <else>
       <td><img src="graphics/file.gif"></td>
       <td><a href="file?file_id=@contents.file_id@">@contents.name@</a></td>
-      <td><a href="download/index?version_id=@contents.live_revision@">(download)</a></td>
+      <td>
+        [<small><a href="download/index?version_id=@contents.live_revision@">download</a><if @contents.delete_p@ eq 1 or @contents.admin_p@ eq 1>&nbsp;|&nbsp<a href="file-delete?file_id=@contents.file_id@">delete</a></if>]</td>
       <td>@contents.content_size@</td>
       <td>@contents.type@</td>
       <td>@contents.last_modified@</td>
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/file-storage/www/index.tcl	22 Feb 2002 21:37:12 -0000	1.9
+++ openacs-4/packages/file-storage/www/index.tcl	13 Mar 2002 21:17:12 -0000	1.10
@@ -43,7 +43,10 @@
 # thus, not be able to actually delete it.  We check this later, but
 # sometime present a link that they won't be able to use.
 
-set delete_p [ad_permission_p $folder_id delete]
+set delete_p $admin_p
+if {!$delete_p} {
+    set delete_p [ad_permission_p $folder_id delete]
+}
 
 set package_id [ad_conn package_id]