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.3 -r1.4
--- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	27 Oct 2014 16:39:55 -0000	1.3
+++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl	7 Aug 2017 23:47:58 -0000	1.4
@@ -8,12 +8,12 @@
     @cvs-id $Id$
 } {
     rel_id:naturalnum,notnull
-    { return_url "" }
+    { return_url:localurl "" }
 } -properties {
     context:onevalue
     export_vars:onevalue
     rel:onerow
-    dependants:multirow
+    dependents:multirow
 } -validate {
     permission_p -requires {rel_id:notnull} {
 	if { ![relation_permission_p -privilege delete $rel_id] } {
@@ -29,13 +29,7 @@
 
 set context [list "Remove relation"]
 
-if { ![db_0or1row select_rel_info {
-    select acs_object_type.pretty_name(r.rel_type) as rel_type_pretty_name,
-           acs_object.name(r.object_id_one) as object_id_one_name,
-           acs_object.name(r.object_id_two) as object_id_two_name,
-           r.object_id_two
-      from acs_rels r
-     where r.rel_id = :rel_id} -column_array rel] 
+if { ![db_0or1row select_rel_info {} -column_array rel] 
 } {
     ad_return_error "Error" "Relation $rel_id does not exist"
     ad_script_abort
@@ -44,26 +38,25 @@
 # Now let's see if removing this relation would violate some
 # constraint.
 
-if { [relation_segment_has_dependant -rel_id $rel_id] } {
+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
-    template::multirow create dependants rel_id rel_type_pretty_name object_id_one_name object_id_two_name export_vars
+    template::multirow create dependents rel_id rel_type_pretty_name object_id_one_name object_id_two_name export_vars
 
-    db_foreach select_dependants {
-	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
-    } {
-	template::multirow append dependants $rel_id $rel_type_pretty_name $object_id_one_name $object_id_two_name [export_vars {rel_id return_url}]
+    db_foreach select_dependents {} {
+	template::multirow append dependents $rel_id $rel_type_pretty_name $object_id_one_name $object_id_two_name [export_vars {rel_id return_url}]
     }
-    ad_return_template remove-dependants-exist
+    ad_return_template remove-dependents-exist
     return
 }
 
 
 set export_vars [export_vars -form {rel_id return_url}]
 
 ad_return_template
+
+# Local variables:
+#    mode: tcl
+#    tcl-indent-level: 4
+#    indent-tabs-mode: nil
+# End: