Index: openacs-4/packages/news-portlet/www/news-portlet-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet-oracle.xql,v
diff -u -N
--- openacs-4/packages/news-portlet/www/news-portlet-oracle.xql 19 Jun 2018 09:28:45 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-
-
-
-oracle8.1.6
-
-
-
- select package_id
- from apm_packages p,
- (select object_id,
- parent_id
- from site_nodes n
- where (object_id is null
- or acs_permission.permission_p(object_id, :user_id, 'read') = 't')
- start with node_id = :root_id
- connect by prior node_id = parent_id) site_map
- where site_map.object_id = p.package_id (+)
- and package_key = 'news'
-
-
-
-
Index: openacs-4/packages/news-portlet/www/news-portlet-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet-postgresql.xql,v
diff -u -N
--- openacs-4/packages/news-portlet/www/news-portlet-postgresql.xql 22 Oct 2018 08:12:30 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-
-
-
-postgresql7.1
-
-
-
- select package_id
- from apm_packages p right outer join
- ( WITH RECURSIVE site_node_tree AS (
- select node_id, parent_id, object_id from site_nodes where node_id = :root_id
- UNION ALL
- select c.node_id, c.parent_id, c.object_id from site_node_tree tree, site_nodes as c
- where c.parent_id = tree.node_id
- )
- select * from site_node_tree n) site_map
- on site_map.object_id = p.package_id
- where package_key = 'news'
- and (site_map.object_id is null or acs_permission__permission_p(site_map.object_id, :user_id, 'read') = 't')
-
-
-
-
Index: openacs-4/packages/news-portlet/www/news-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v
diff -u -N -r1.25.2.2 -r1.25.2.3
--- openacs-4/packages/news-portlet/www/news-portlet.tcl 27 Sep 2019 13:12:35 -0000 1.25.2.2
+++ openacs-4/packages/news-portlet/www/news-portlet.tcl 2 Jan 2020 18:40:10 -0000 1.25.2.3
@@ -72,7 +72,20 @@
set news_url [news_util_get_url $package_id]
if { $display_subgroup_items_p } {
- set subgroup_package_ids [db_list select_subgroup_package_ids {}]
+ set subgroup_package_ids [db_list select_subgroup_package_ids {
+ select package_id
+ from apm_packages p right outer join
+ ( WITH RECURSIVE site_node_tree AS (
+ select node_id, parent_id, object_id from site_nodes where node_id = :root_id
+ UNION ALL
+ select c.node_id, c.parent_id, c.object_id from site_node_tree tree, site_nodes as c
+ where c.parent_id = tree.node_id
+ )
+ select * from site_node_tree n) site_map
+ on site_map.object_id = p.package_id
+ where package_key = 'news'
+ and (site_map.object_id is null or acs_permission.permission_p(site_map.object_id, :user_id, 'read') = 't')
+ }]
if {[llength $subgroup_package_ids] > 0} {
set one_instance_p 0
lappend list_of_package_ids {*}$subgroup_package_ids
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-oracle.xql 7 Aug 2017 23:47:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-
-
- oracle8.1.6
-
-
-
-
- select c.constraint_id, c.constraint_name
- from rel_constraints c
- application_group_segments s1, application_group_segments s2
- where s1.segment_id = c.rel_segment
- and s1.package_id = :package_id
- and s2.segment_id = c.required_rel_segment
- and s2.package_id = :package_id
- and exists (select 1
- from acs_object_party_privilege_map perm
- where perm.object_id = c.constraint_id
- and perm.party_id = :user_id
- and perm.privilege = 'read')
- order by lower(c.constraint_name)
-
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index-postgresql.xql 7 Aug 2017 23:47:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-
-
- postgresql9.0
-
-
-
-
- select c.constraint_id, c.constraint_name
- from rel_constraints c
- application_group_segments s1, application_group_segments s2
- where s1.segment_id = c.rel_segment
- and s1.package_id = :package_id
- and s2.segment_id = c.required_rel_segment
- and s2.package_id = :package_id
- and acs_permission__permission_p(c.constraint_id, :user_id, 'read')
- order by lower(c.constraint_name)
-
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl 7 Aug 2017 23:47:58 -0000 1.3
+++ openacs-4/packages/acs-subsite/www/admin/rel-segments/constraints/index.tcl 2 Jan 2020 18:41:57 -0000 1.3.2.1
@@ -15,7 +15,17 @@
# Select out basic information about all the constraints on which the
# user has read permission
-db_multirow constraints select_rel_constraints {}
+db_multirow constraints select_rel_constraints {
+ select c.constraint_id, c.constraint_name
+ from rel_constraints c
+ application_group_segments s1, application_group_segments s2
+ where s1.segment_id = c.rel_segment
+ and s1.package_id = :package_id
+ and s2.segment_id = c.required_rel_segment
+ and s2.package_id = :package_id
+ and acs_permission.permission_p(c.constraint_id, :user_id, 'read')
+ order by lower(c.constraint_name)
+}
ad_return_template
Index: openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-service-contract/www/binding-uninstall-oracle.xql 30 Jan 2006 23:51:40 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
- begin
- acs_sc_binding.del(contract_id => :contract_id, impl_id => :impl_id);
- end;
-
-
-
-
-
Index: openacs-4/packages/acs-service-contract/www/binding-uninstall-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-uninstall-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-service-contract/www/binding-uninstall-postgresql.xql 31 Jan 2002 03:04:32 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
- select acs_sc_binding__delete(:contract_id,:impl_id)
-
-
-
-
-
Index: openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl 5 Jan 2018 22:59:57 -0000 1.4
+++ openacs-4/packages/acs-service-contract/www/binding-uninstall.tcl 2 Jan 2020 18:47:00 -0000 1.4.2.1
@@ -7,9 +7,12 @@
impl_id:naturalnum,notnull
}
+db_dml binding_uninstall {
+ delete from acs_sc_bindings
+ where contract_id = :contract_id
+ and impl_id = :impl_id
+}
-db_exec_plsql binding_uninstall "select acs_sc_binding__delete($contract_id,$impl_id)"
-
ad_returnredirect ""
ad_script_abort