Commit 6c6c538a authored by Frank Bergmann's avatar Frank Bergmann

- Elmininated the project's folder from the tree returned for a project

parent 3919a47e
{"text":".","children": [ { "text":"."@file_json;noquote@
@file_json;noquote@ }
}
]}
...@@ -16,12 +16,9 @@ ad_page_contract { ...@@ -16,12 +16,9 @@ ad_page_contract {
{node ""} {node ""}
} }
set root_file_id $object_id set root_file_id $object_id
if {"" ne $node && [string is integer $node]} { set root_file_id $node } if {"" ne $node && [string is integer $node]} { set root_file_id $node }
# -------------------------------------------- # --------------------------------------------
# Security & Permissions # Security & Permissions
# #
...@@ -42,8 +39,6 @@ set ttt { ...@@ -42,8 +39,6 @@ set ttt {
# #
set folder_id [im_rest_fs_folder_for_object -object_id $object_id] set folder_id [im_rest_fs_folder_for_object -object_id $object_id]
# permission::require_permission -party_id $current_user_id -object_id $folder_id -privilege "read" # permission::require_permission -party_id $current_user_id -object_id $folder_id -privilege "read"
# set package_and_root [fs::get_folder_package_and_root $folder_id] # set package_and_root [fs::get_folder_package_and_root $folder_id]
...@@ -55,9 +50,6 @@ set folder_path "" ...@@ -55,9 +50,6 @@ set folder_path ""
# -------------------------------------------- # --------------------------------------------
# Main hierarchical SQL # Main hierarchical SQL
# #
set top_level [db_string top_level "select tree_level(tree_sortkey) from cr_items where item_id = :folder_id"] set top_level [db_string top_level "select tree_level(tree_sortkey) from cr_items where item_id = :folder_id"]
set sql " set sql "
...@@ -92,7 +84,8 @@ set sql " ...@@ -92,7 +84,8 @@ set sql "
where where
parent_ci.item_id = :folder_id and parent_ci.item_id = :folder_id and
ci.tree_sortkey between parent_ci.tree_sortkey and tree_right(parent_ci.tree_sortkey) ci.tree_sortkey between parent_ci.tree_sortkey and tree_right(parent_ci.tree_sortkey)
and tree_level(ci.tree_sortkey) > :top_level
-- and tree_level(ci.tree_sortkey) <= :top_level+1
order by order by
ci.tree_sortkey ci.tree_sortkey
" "
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment