Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-oracle.xql 15 May 2001 16:59:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
-
- select acs_group.name(:group_id) as group_name,
- acs_object_type.pretty_name(:rel_type) as rel_type_pretty_name,
- acs_rel_type.role_pretty_plural(rel_types.role_two) as role_pretty_plural,
- acs_rel_type.role_pretty_name(rel_types.role_two) as role_pretty_name
- from acs_rel_types rel_types
- where rel_types.rel_type = :rel_type
-
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-postgresql.xql 7 Aug 2017 23:47:58 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-
-
-
-
- postgresql9.0
-
-
-
-
- select acs_group__name(:group_id) as group_name,
- acs_object_type__pretty_name(:rel_type) as rel_type_pretty_name,
- acs_rel_type__role_pretty_plural(rel_types.role_two) as role_pretty_plural,
- acs_rel_type__role_pretty_name(rel_types.role_two) as role_pretty_name
- from acs_rel_types rel_types
- where rel_types.rel_type = :rel_type
-
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl,v
diff -u -N -r1.10 -r1.10.2.1
--- openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 3 Jul 2018 13:22:40 -0000 1.10
+++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display.tcl 2 Jan 2020 17:16:36 -0000 1.10.2.1
@@ -39,9 +39,19 @@
# Select out the group name and the group's object type. Note we can
# use 1row because the validate filter above will catch missing groups
+db_1row group_and_rel_info {
+ select (select group_name from groups
+ where group_id = :group_id) as group_name,
+ (select pretty_name from acs_object_types
+ where object_type = :rel_type) as rel_type_pretty_name,
+ r.pretty_plural as role_pretty_plural,
+ r.pretty_name as role_pretty_name
+ from acs_rel_types rel_types,
+ acs_rel_roles r
+ where r.role = rel_types.role_two
+ and rel_types.rel_type = :rel_type
+}
-db_1row group_and_rel_info {}
-
# The role pretty names can be message catalog keys that need
# to be localized before they are displayed
set role_pretty_name [lang::util::localize $role_pretty_name]
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-oracle.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-oracle.xql 20 Jun 2018 08:23:51 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-
-
-
- oracle8.1.6
-
-
-
-
- select r.viol_rel_id as rel_id,
- acs_object_type.pretty_name(r.viol_rel_type) as rel_type_pretty_name,
- acs_object.name(r.viol_object_id_one) as object_id_one_name,
- acs_object.name(r.viol_object_id_two) as object_id_two_name
- from rc_violations_by_removing_rel r
- where r.rel_id = :rel_id
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove-postgresql.xql,v
diff -u -N
--- openacs-4/packages/acs-subsite/www/admin/relations/remove-postgresql.xql 20 Jun 2018 08:23:51 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-
-
-
- postgresql7.1
-
-
-
-
- select r.viol_rel_id as rel_id,
- acs_object_type__pretty_name(r.viol_rel_type) as rel_type_pretty_name,
- acs_object__name(r.viol_object_id_one) as object_id_one_name,
- acs_object__name(r.viol_object_id_two) as object_id_two_name
- from rc_violations_by_removing_rel r
- where r.rel_id = :rel_id
-
-
-
-
-
Index: openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 20 Jun 2018 08:23:51 -0000 1.6
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 2 Jan 2020 17:19:41 -0000 1.6.2.1
@@ -50,7 +50,15 @@
if { [relation_segment_has_dependent -rel_id $rel_id] } {
set return_url "[ad_conn url]?[ad_conn query]"
# We can't remove this relation - display the violations
- db_multirow -extend {export_vars} dependents select_dependents {} {
+ db_multirow -extend {export_vars} dependents select_dependents {
+ select r.viol_rel_id as rel_id,
+ (select pretty_name from acs_object_types
+ where object_type = r.viol_rel_type) as rel_type_pretty_name,
+ acs_object.name(r.viol_object_id_one) as object_id_one_name,
+ acs_object.name(r.viol_object_id_two) as object_id_two_name
+ from rc_violations_by_removing_rel r
+ where r.rel_id = :rel_id
+ } {
set export_vars [export_vars {rel_id return_url}]
}
ad_return_template remove-dependents-exist