Index: openacs-4/packages/attachments/www/attach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/attachments/www/attach.tcl 29 Jun 2004 10:17:47 -0000 1.8 +++ openacs-4/packages/attachments/www/attach.tcl 13 Jan 2005 13:56:08 -0000 1.9 @@ -17,18 +17,15 @@ # We require the write permission on an object permission::require_permission -object_id $object_id -privilege write -set write_permission_p \ - [permission::permission_p -object_id $folder_id -privilege write] # Give the object a nasty name if it doesn't have a pretty name if {[empty_string_p $pretty_object_name]} { set pretty_object_name "[_ attachments.Object] #$object_id" } # Load up file storage information -set root_folder_id [attachments::get_root_folder] if {[empty_string_p $folder_id]} { - set folder_id $root_folder_id + set folder_id [dotlrn_fs::get_user_shared_folder -user_id $user_id] } # sanity check @@ -37,6 +34,9 @@ ad_script_abort } +set write_permission_p \ + [permission::permission_p -object_id $folder_id -privilege write] + # Check permission permission::require_permission -object_id $folder_id -privilege read @@ -53,11 +53,7 @@ set passthrough_vars "object_id=$object_id&return_url=[ns_urlencode $return_url]&pretty_object_name=[ns_urlencode $pretty_object_name]" -if {$folder_id == $root_folder_id} { - set fs_context_bar_html "[_ attachments.Top]" -} else { - set fs_context_bar_html [attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id] -} +set fs_context_bar_html [attachments::context_bar -extra_vars $passthrough_vars -folder_id $folder_id] set context "[_ attachments.Attach]"