Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-rest-fs-openacs
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-rest-fs-openacs
Commits
6c6c538a
Commit
6c6c538a
authored
Jan 06, 2019
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Elmininated the project's folder from the tree returned for a project
parent
3919a47e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
13 deletions
+5
-13
file-tree.json.adp
www/file-tree.json.adp
+3
-4
file-tree.json.tcl
www/file-tree.json.tcl
+2
-9
No files found.
www/file-tree.json.adp
View file @
6c6c538a
{"text":".","children": [
@file_json;noquote@
}
]}
{ "text":"."@file_json;noquote@
}
www/file-tree.json.tcl
View file @
6c6c538a
...
...
@@ -16,12 +16,9 @@ ad_page_contract {
{
node
""
}
}
set
root_file_id
$object
_id
if
{
""
ne
$node
&&
[
string
is integer
$node
]}
{
set root_file_id
$node
}
# --------------------------------------------
# Security & Permissions
#
...
...
@@ -42,8 +39,6 @@ set ttt {
#
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"
# set package_and_root [fs::get_folder_package_and_root $folder_id
]
...
...
@@ -55,9 +50,6 @@ set folder_path ""
# --------------------------------------------
# Main hierarchical SQL
#
set
top_level
[
db_string top_level
"select tree_level(tree_sortkey) from cr_items where item_id = :folder_id"
]
set
sql
"
...
...
@@ -92,7 +84,8 @@ set sql "
where
parent_ci.item_id = :folder_id and
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
ci.tree_sortkey
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment