Commit c63c3825 authored by Frank Bergmann's avatar Frank Bergmann

- Now registering content types for new folders

parent 0947edaa
...@@ -81,8 +81,8 @@ ad_proc -public im_rest_fs_folder_for_object { ...@@ -81,8 +81,8 @@ ad_proc -public im_rest_fs_folder_for_object {
where ci.item_id = cf.folder_id and where ci.item_id = cf.folder_id and
ci.name = :folder_name ci.name = :folder_name
" -default ""] " -default ""]
# Create folder if it doesn't exist # Create folder if it doesn't exist
if {"" eq $folder_id} { if {"" eq $folder_id} {
set folder_id [fs::new_folder \ set folder_id [fs::new_folder \
-name $folder_name \ -name $folder_name \
...@@ -97,7 +97,7 @@ ad_proc -public im_rest_fs_folder_for_object { ...@@ -97,7 +97,7 @@ ad_proc -public im_rest_fs_folder_for_object {
db_string reg "select content_folder__register_content_type(:folder_id, 'file_storage_object', true)" db_string reg "select content_folder__register_content_type(:folder_id, 'file_storage_object', true)"
db_string reg "select content_folder__register_content_type(:folder_id, 'content_extlink', true)" db_string reg "select content_folder__register_content_type(:folder_id, 'content_extlink', true)"
} }
# Associate the folder with the object # Associate the folder with the object
set rel_id [db_string create_rel " set rel_id [db_string create_rel "
select acs_rel__new ( select acs_rel__new (
......
...@@ -32,13 +32,18 @@ if {"" eq $parent_id} { ...@@ -32,13 +32,18 @@ if {"" eq $parent_id} {
ad_script_abort ad_script_abort
} }
fs::new_folder \ set folder_id [fs::new_folder \
-name $folder_name \ -name $folder_name \
-pretty_name $folder_name \ -pretty_name $folder_name \
-parent_id $parent_id \ -parent_id $parent_id \
-creation_user $user_id \ -creation_user $user_id \
-creation_ip [ad_conn peeraddr] \ -creation_ip [ad_conn peeraddr] \
-package_id $package_id -package_id $package_id \
]
db_string reg "select content_folder__register_content_type(:folder_id, 'content_folder', true)"
db_string reg "select content_folder__register_content_type(:folder_id, 'file_storage_object', true)"
db_string reg "select content_folder__register_content_type(:folder_id, 'content_extlink', true)"
doc_return 200 "text/plain" "project_id=$project_id, path=$path" doc_return 200 "text/plain" "project_id=$project_id, path=$path"
......
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