Index: openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 19 Jan 2018 14:09:48 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/rel-segments/delete-2.tcl 7 Jun 2018 17:41:01 -0000 1.7 @@ -14,28 +14,28 @@ { return_url:localurl "" } } -validate { segment_exists_p -requires {segment_id:notnull} { - if { ![rel_segments_permission_p -privilege delete $segment_id] } { - ad_complain "The segment either does not exist or you do not have permission to delete it" - } + if { ![permission::permission_p -object_id $segment_id -privilege "delete"] } { + ad_complain "The segment either does not exist or you do not have permission to delete it" + } } } if {$operation eq "Yes, I really want to delete this segment"} { if { $return_url eq "" } { - # Go back to the group for this segment - set group_id [db_string select_group_id { - select s.group_id from rel_segments s where s.segment_id = :segment_id - } -default ""] - if { $group_id ne "" } { - set return_url [export_vars -base ../groups/one group_id] - } + # Go back to the group for this segment + set group_id [db_string select_group_id { + select s.group_id from rel_segments s where s.segment_id = :segment_id + } -default ""] + if { $group_id ne "" } { + set return_url [export_vars -base ../groups/one group_id] + } } # Delete all the constraints that require this segment db_transaction { - rel_segments_delete $segment_id + rel_segments_delete $segment_id } -} +} if { $return_url eq "" } { set return_url [export_vars -base one {segment_id}]