Commit fd8b22f3 authored by Frank Bergmann's avatar Frank Bergmann

- Fixed issue with project folders.

  Now all project folders are below the file-storage main folder
parent 43023a8b
......@@ -47,7 +47,7 @@ ad_proc -public im_rest_fs_folder_for_object {
set object_name [acs_object_name $object_id]
set object_type [db_string otype "select min(pretty_name) from acs_object_types where object_type in (select object_type from acs_objects where object_id = :object_id)" -default "Object"]
set description "Default folder for $object_type: $object_name"
set folder_name "$object_type: $object_name"
# Check if the folder exists with object type and object name
# in order to avoid errors with duplicate folder names
......@@ -56,18 +56,18 @@ ad_proc -public im_rest_fs_folder_for_object {
from cr_items ci,
cr_folders cf
where ci.item_id = cf.folder_id and
ci.name = :object_type||': '||:object_name
ci.name = :folder_name
" -default ""]
# Create folder if it doesn't exist
if {"" eq $folder_id} {
set folder_id [fs::new_folder \
-name "$object_type: $object_name" \
-pretty_name $object_name \
-name $folder_name \
-pretty_name $folder_name \
-parent_id $package_root_folder_id \
-creation_user $current_user_id \
-creation_ip [ad_conn peeraddr] \
-description $description \
-description $folder_name \
]
db_string reg "select content_folder__register_content_type(:folder_id, 'content_folder', true)"
......
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