Index: openacs-4/packages/file-storage/www/file-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-edit.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/file-storage/www/file-edit.tcl	26 May 2005 08:28:46 -0000	1.8
+++ openacs-4/packages/file-storage/www/file-edit.tcl	15 Jun 2007 17:40:29 -0000	1.9
@@ -31,11 +31,45 @@
 set page_title [_ file-storage.file_edit_page_title]
 
 set title_help [_ file-storage.lt_Please_enter_the_new_]
-set submit_label [_ file-storage.Change_Name]
 
-ad_form -action file-edit-2 -export file_id -form {
+ad_form -export file_id -form {
     {title:text(text) {help_text $title_help} {label \#file-storage.Name\#}}
+}
+
+set package_id [ad_conn package_id]
+if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
+    category::ad_form::add_widgets \
+	 -container_object_id $package_id \
+	 -categorized_object_id $file_id \
+	 -form_name file-edit
+    set submit_label [_ file-storage.Save]
+} else {
+    set submit_label [_ file-storage.Change_Name]
+}
+
+ad_form -extend -form {
     {submit:text(submit) {label $submit_label}}
-} -has_submit 1
+} -on_request {
+} -on_submit {
+    if [catch {
+	db_dml edit_title {}
+    } errmsg] {
+	if { [db_string duplicate_check {}] } {
+	    ad_return_complaint 1 "[_ file-storage.lt_It_appears_that_there]"
+	} else {
+	    ad_return_complaint 1 "[_ file-storage.lt_We_got_an_error_that_]
 
+	    <pre>$errmsg</pre>"
+	}
+	ad_script_abort
+    }
+    if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
+	category::map_object -remove_old -object_id $file_id [category::ad_form::get_categories \
+								       -container_object_id $package_id \
+								       -element_name category_id]
+    }
+} -after_submit {
+    ad_returnredirect "file?file_id=$file_id"
+}
+
 ad_return_template