Index: openacs-4/packages/file-storage/www/folder-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-edit.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/file-storage/www/folder-edit.tcl	7 Aug 2017 23:48:11 -0000	1.6
+++ openacs-4/packages/file-storage/www/folder-edit.tcl	21 Sep 2017 09:36:19 -0000	1.7
@@ -26,7 +26,13 @@
 set submit_label [_ file-storage.Save]
 
 ad_form -export folder_id -form {
-    {folder_name:text(text) {label "\#file-storage.Folder_Name\#"}}
+    {folder_name:text(text)
+        {label "\#file-storage.Folder_Name\#"}
+    }
+    {description:text(textarea),optional
+        {label \#file-storage.Description\#}
+        {html "rows 5 cols 35"}
+    }
 }
 
 
@@ -40,21 +46,28 @@
 
 
 ad_form -extend -form {
-    {submit:text(submit) {label $submit_label}}
+    {submit:text(submit) {label $submit_label}}    
 } -on_request {
-    set folder_name [fs_get_folder_name $folder_id]
+    content::item::get -item_id $folder_id -array folder
+    set folder_name $folder(name)
+    set description $folder(description)
 } -on_submit {
 
-    db_exec_plsql folder_rename {}
+    db_transaction {
+        content::folder::update -folder_id $folder_id \
+            -attributes [list \
+                             [list name $folder_name] \
+                             [list description $description]]
+        
+        if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
+            category::map_object -remove_old -object_id $folder_id [category::ad_form::get_categories \
+                                                                        -container_object_id $package_id \
+                                                                        -element_name category_id]
+        }        
 
-    if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
-	category::map_object -remove_old -object_id $folder_id [category::ad_form::get_categories \
-								       -container_object_id $package_id \
-								       -element_name category_id]
+        callback fs::folder_edit -package_id [ad_conn package_id] -folder_id $folder_id
     }
 
-    callback fs::folder_edit -package_id [ad_conn package_id] -folder_id $folder_id
-
 } -after_submit {
     ad_returnredirect "?folder_id=$folder_id"
 }