Index: openacs-4/packages/file-storage/www/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/file-storage/www/delete.tcl 2 Feb 2008 12:17:27 -0000 1.7 +++ openacs-4/packages/file-storage/www/delete.tcl 27 Oct 2014 16:41:32 -0000 1.8 @@ -1,37 +1,31 @@ ad_page_contract { delete items } { - object_id:notnull,multiple + object_id:multiple,naturalnum,notnull {confirm_p:optional,boolean 0} {return_url ""} -} -errors {object_id:,notnull,integer,multiple {Please select at least one item to delete.} } + set user_id [ad_conn user_id] - template::list::create \ - -name delete_list \ - -multirow delete_list \ - -key fs_object_id \ - -no_data "No items selected" \ - -elements { - name { - label "\#file-storage.Name\#" - } - delete_message { - label "" - } - } +template::list::create \ + -name delete_list \ + -multirow delete_list \ + -key fs_object_id \ + -no_data "No items selected" \ + -elements { + name { + label "\#file-storage.Name\#" + } + delete_message { + label "" + } + } set allowed_count 0 set not_allowed_count 0 -# make sure none of these items are root folders. There is no way to -# click a checkbox, but who knows how the item_id might get in there -if {[llength $object_id] == 1} { - set object_id [split [lindex $object_id 0]] -} - set root_folders_count [db_string count_root_folders "" -default 0] if {$root_folders_count > 0} { ad_complain [_ file-storage.lt_You_may_not_delete_th] @@ -45,20 +39,19 @@ set delete_message "" incr allowed_count } else { - set delete_message [_ file_storage.Not_Allowed] + set delete_message [_ file-storage.Not_Allowed] incr not_allowed_count } } set total_count [template::multirow size delete_list] - set delete_inform [_ file-storage.lt_Do_you_want_to_delete] ad_form -name delete_confirm -cancel_url $return_url -form { {notice:text(inform) {label ""} {value $delete_inform}} {return_url:text(hidden) {value $return_url}} - {object_id:text(hidden) {value $object_id}} + {object_id:naturalnum(hidden) {values $object_id}} } ad_form -extend -name delete_confirm -on_submit {