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.2.4 -r1.3.2.5 --- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 20 May 2016 20:02:44 -0000 1.3.2.4 +++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 21 Apr 2017 15:27:49 -0000 1.3.2.5 @@ -13,7 +13,7 @@ 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] } { @@ -38,15 +38,15 @@ # 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 {} { - 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 }