Index: openacs-4/packages/file-storage/www/move-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/Attic/move-postgresql.xql,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/file-storage/www/move-postgresql.xql 2 Apr 2013 12:04:43 -0000 1.9
+++ openacs-4/packages/file-storage/www/move-postgresql.xql 7 Aug 2017 23:48:11 -0000 1.10
@@ -35,18 +35,14 @@
select
- cf.folder_id, ci1.parent_id, cf.label, tree_level(ci1.tree_sortkey) as level_num
- from cr_folders cf, cr_items ci1, cr_items ci2
+ cf.folder_id, ci1.parent_id, cf.label, tree_level(ci1.tree_sortkey) as level_num
+ from cr_folders cf, cr_items ci1, cr_items ci2
where
- ci1.tree_sortkey between ci2.tree_sortkey and
- tree_right(ci2.tree_sortkey)
- and ci2.item_id=:root_folder_id
- and ci1.item_id=cf.folder_id
- and exists (select 1
- from acs_object_party_privilege_map m
- where m.object_id = cf.folder_id
- and m.party_id = :user_id
- and m.privilege = 'write')
+ ci1.tree_sortkey between ci2.tree_sortkey and tree_right(ci2.tree_sortkey)
+ and ci2.item_id=:root_folder_id
+ and ci1.item_id=cf.folder_id
+ and acs_permission__permission_p(cf.folder_id, :user_id, 'write')
+
order by ci1.tree_sortkey, cf.label
@@ -89,5 +85,13 @@
)
-
+
+
+
+ select count(*) from cr_items
+ where name=:name
+ and parent_id=:folder_id
+
+
+