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 -r1.4 -r1.5 --- openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 7 Aug 2017 23:47:58 -0000 1.4 +++ openacs-4/packages/acs-subsite/www/admin/relations/remove.tcl 7 Jun 2018 17:46:16 -0000 1.5 @@ -16,20 +16,20 @@ dependents:multirow } -validate { permission_p -requires {rel_id:notnull} { - if { ![relation_permission_p -privilege delete $rel_id] } { - ad_complain "The relation either does not exist or you do not have permission to remove it" - } + if { ![permission::permission_p -object_id $rel_id -privilege "delete"] } { + ad_complain "The relation either does not exist or you do not have permission to remove it" + } } relation_in_scope_p -requires {rel_id:notnull permission_p} { - if { ![application_group::contains_relation_p -rel_id $rel_id]} { - ad_complain "The relation either does not exist or does not belong to this subsite." - } + if { ![application_group::contains_relation_p -rel_id $rel_id]} { + ad_complain "The relation either does not exist or does not belong to this subsite." + } } } set context [list "Remove relation"] -if { ![db_0or1row select_rel_info {} -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,7 +44,7 @@ template::multirow create dependents rel_id rel_type_pretty_name object_id_one_name object_id_two_name export_vars 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}] + 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-dependents-exist return