Index: openacs-4/packages/file-storage/www/file-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-postgresql.xql,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/file-storage/www/file-postgresql.xql	15 Dec 2003 11:18:45 -0000	1.11
+++ openacs-4/packages/file-storage/www/file-postgresql.xql	27 Mar 2004 17:06:41 -0000	1.12
@@ -13,16 +13,15 @@
       <querytext>
       
 	select person__name(o.creation_user) as owner,
-       		i.name as title,
-       		r.title as name,
+       		f.name as title,
+       		coalesce(f.url,f.file_upload_name) as name,
        		acs_permission__permission_p(:file_id,:user_id,'write') as write_p,
        		acs_permission__permission_p(:file_id,:user_id,'delete') as delete_p,
        		acs_permission__permission_p(:file_id,:user_id,'admin') as admin_p,
-                content_item__get_path(o.object_id, :root_folder_id) as file_url,		i.live_revision
-	from   acs_objects o, cr_revisions r, cr_items i
+                content_item__get_path(o.object_id, :root_folder_id) as file_url, f.live_revision
+	from   acs_objects o, fs_objects f
 	where  o.object_id = :file_id
-	and    i.item_id   = o.object_id
-	and    r.revision_id = i.live_revision
+	and    f.object_id = o.object_id
       </querytext>
 </fullquery>
 
Index: openacs-4/packages/file-storage/www/folder-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/file-storage/www/folder-chunk.tcl	27 Mar 2004 16:50:17 -0000	1.22
+++ openacs-4/packages/file-storage/www/folder-chunk.tcl	27 Mar 2004 17:06:41 -0000	1.23
@@ -115,7 +115,7 @@
     if {[string equal $type url]} {
         set label [_ file-storage.link]
 	set properties_link [_ file-storage.properties]
-	set properties_url "file?[export_vars {{file_id $object_id}}]"
+	set properties_url "simple-edit?[export_vars {{object_id $object_id}}]"
 	set icon "/resources/file-storage/link.gif"
         set file_url $url
     } elseif {![string equal $type folder]} {