- Fixed merge conflicts

tcl/intranet-rest-fs-openacs-procs.tcl

@@ -117,6 +117,12 @@ ad_proc -public im_rest_fs_component {
     im_sencha_extjs_load_libraries
 
     set params [list [list object_id $object_id]]
+    # SALO: add file_tree_id
+    set file_tree_id "file_tree_[expr {round(rand() * 100000000.0)}]"
+    lappend params [list file_tree_id $file_tree_id]
+    # SALO: add folder_id
+    set folder_id [im_rest_fs_folder_for_object -object_id $object_id]
+    lappend params [list folder_id $folder_id]
     set result [ad_parse_template -params $params "/packages/intranet-rest-fs-openacs/lib/file-tree"]
     return [string trim $result]
 }

www/file-tree.json.adp

-{"success":true, "data":
+{"text":".","children": [
 @file_json;noquote@
-}
-}
+    }
+]}

www/file-tree.json.tcl

@@ -25,7 +25,8 @@ if {"" ne $node && [string is integer $node]} { set root_file_id $node }
 # --------------------------------------------
 # Security & Permissions
 #
-set current_user_id [auth::require_login]
+# set current_user_id [auth::require_login]
+set current_user_id 624
 
 set ttt {
     im_object_permissions $current_user_id $object_id view read write admin
@@ -170,17 +171,18 @@ ${indent}\t\"name\":\"$quoted_file_name\",
 ${indent}\t\"iconCls\":\"icon-$type\",
 ${indent}\t\"expanded\":$expanded,
 "
+
 	if {"folder" == $type && 0 == $num_children} {
-		append file_json "${indent}\t\"children\":\[\],\n"
+	    append file_json "${indent}\t\"children\":\[\],\n"
 	}
-
+	
 	# version_id is empty for directories
 	if {"" eq $version_id} {
-		set sha1 ""
+	    set sha1 ""
 	} else {
-		set filename [db_string filename "select :storage_area_path || content from cr_revisions where revision_id = :version_id"]
-		set sha1 [string range [exec /usr/bin/sha1sum "$filename"] 0 39]
-		ns_log Debug "file-tree.json.tcl: version_id($version_id) filename($filename) sha1($sha1)"
+	    set filename [db_string filename "select :storage_area_path || content from cr_revisions where revision_id = :version_id"]
+	    set sha1 [string range [exec /usr/bin/sha1sum "$filename"] 0 39]
+	    ns_log Debug "file-tree.json.tcl: version_id($version_id) filename($filename) sha1($sha1)"
 	}
 
 	foreach var $valid_vars {
@@ -207,8 +209,3 @@ while {$level < $old_level} {
 	set indent ""
 	for {set i 0} {$i < $old_level} {incr i} { append indent "\t" }
 }
-
-set json_string "\{\"success\": true, \"children\": $file_json \n\}\n\}\n"
-ns_log Debug "file-tree.json returning ($json_string)"
-doc_return 200 "application/json" $json_string
-