Index: openacs-4/packages/file-storage/www/copy-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/copy-oracle.xql,v diff -u -r1.7 -r1.7.2.1 --- openacs-4/packages/file-storage/www/copy-oracle.xql 7 Aug 2017 23:48:11 -0000 1.7 +++ openacs-4/packages/file-storage/www/copy-oracle.xql 15 Mar 2019 10:09:24 -0000 1.7.2.1 @@ -12,16 +12,6 @@ oracle 8.1.6 - - - - select fs.object_id, fs.name, fs.title, fs.parent_id, - acs_permission.permission_p(fs.object_id, :user_id, 'read') as copy_p, fs.type - from fs_objects fs - where fs.object_id in ([template::util::tcl_to_sql_list $object_id]) - order by copy_p - - Index: openacs-4/packages/file-storage/www/copy-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/copy-postgresql.xql,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/file-storage/www/copy-postgresql.xql 7 Aug 2017 23:48:11 -0000 1.9 +++ openacs-4/packages/file-storage/www/copy-postgresql.xql 15 Mar 2019 10:09:24 -0000 1.9.2.1 @@ -11,16 +11,6 @@ postgresql 7.2 - - - - select fs.object_id, fs.name, fs.title, fs.parent_id, - acs_permission__permission_p(fs.object_id, :user_id, 'read') as copy_p, fs.type - from fs_objects fs - where fs.object_id in ([template::util::tcl_to_sql_list $object_id]) - order by copy_p - - Index: openacs-4/packages/file-storage/www/copy.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/copy.tcl,v diff -u -r1.11 -r1.11.2.1 --- openacs-4/packages/file-storage/www/copy.tcl 7 Aug 2017 23:48:11 -0000 1.11 +++ openacs-4/packages/file-storage/www/copy.tcl 15 Mar 2019 10:09:24 -0000 1.11.2.1 @@ -27,7 +27,13 @@ set not_allowed_parents [list] set not_allowed_children [list] -db_multirow -extend {copy_message} copy_objects get_copy_objects "" { +db_multirow -extend {copy_message} copy_objects get_copy_objects [subst { + select fs.object_id, fs.name, fs.title, fs.parent_id, + acs_permission.permission_p(fs.object_id, :user_id, 'read') as copy_p, fs.type + from fs_objects fs + where fs.object_id in ([template::util::tcl_to_sql_list $object_id]) + order by copy_p +}] { if {$copy_p} { set copy_message "" incr allowed_count