Index: openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js 28 Jun 2008 07:06:38 -0000 1.11
+++ openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs-min.js 1 Jul 2008 13:39:43 -0000 1.12
@@ -566,7 +566,11 @@
Ext.Msg.alert(acs_lang_text.alert||"Alert",acs_lang_text.cant_del_root||"The root folder can not be deleted.");
return;
}else{
+if(typeof (_8c.attributes.attributes["size"])=="undefined"){
+var msg="";
+}else{
var msg=_82+" "+_8c.attributes.attributes["size"]+".
";
+}
msg=msg+_81+" "+_8c.attributes["text"]+"?";
}
}
Index: openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js 28 Jun 2008 07:06:38 -0000 1.14
+++ openacs-4/packages/ajax-filestorage-ui/www/resources/ajaxfs.js 1 Jul 2008 13:39:43 -0000 1.15
@@ -1110,7 +1110,11 @@
return;
} else {
// confirmation message
- var msg = err_msg_txt2 + " "+selectednode.attributes.attributes["size"]+".
";
+ if(typeof(selectednode.attributes.attributes["size"]) == "undefined") {
+ var msg = "";
+ } else {
+ var msg = err_msg_txt2 + " "+selectednode.attributes.attributes["size"]+".
";
+ }
msg = msg + err_msg_txt+' '+selectednode.attributes["text"]+'?';
}
Index: openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl 10 Jun 2008 12:48:56 -0000 1.6
+++ openacs-4/packages/ajax-filestorage-ui/www/xmlhttp/load-treenodes.tcl 1 Jul 2008 13:39:43 -0000 1.7
@@ -37,17 +37,15 @@
set children ""
set leaf "false"
set expanded "false"
-
+
set content_size_pretty [lc_numeric $content_size]
- if { $content_size_pretty == 0 } {
+ #if { $content_size_pretty == 0 } {
+ # set leaf "true"
+ # set expanded "true"
+ # set children ",\"children\":\[\]"
+ # }
- set leaf "true"
- set expanded "true"
- set children ",\"children\":\[\]"
-
- }
-
append content_size_pretty " [_ file-storage.items]"
if { $type == "symlink" } {
@@ -83,7 +81,6 @@
}
}
- # c/o Franz Penz
regsub -all {"} $qtip {\"} qtip
regsub -all {"} $name {\"} name