Index: openacs-4/packages/acs-subsite/www/admin/parties/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/parties/one.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-subsite/www/admin/parties/one.tcl 7 Aug 2017 23:47:58 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/parties/one.tcl 7 Jun 2018 17:30:17 -0000 1.7 @@ -19,14 +19,14 @@ attributes:multirow } -validate { parties_exists_p -requires {party_id:notnull} { - if { ![party::permission_p $party_id] } { - ad_complain "The party either does not exist or you do not have permission to view it" - } + if { ![permission::permission_p -object_id $party_id -privilege "read"] } { + ad_complain "The party either does not exist or you do not have permission to view it" + } } party_in_scope_p -requires {party_id:notnull parties_exists_p} { - if { ![application_group::contains_party_p -party_id $party_id]} { - ad_complain "The party either does not exist or does not belong to this subsite." - } + if { ![application_group::contains_party_p -party_id $party_id]} { + ad_complain "The party either does not exist or does not belong to this subsite." + } } } @@ -44,12 +44,12 @@ set object_type_path_list [subsite::util::object_type_path_list $party_type party] set redirects_for_type [list \ - group "groups/one?group_id=$party_id" \ - rel_segment "rel-segments/one?segment_id=$party_id"] + group "groups/one?group_id=$party_id" \ + rel_segment "rel-segments/one?segment_id=$party_id"] foreach {type url} $redirects_for_type { if {[lsearch $object_type_path_list $type] != -1} { - ad_returnredirect [ad_conn package_url]admin/$url + ad_returnredirect [ad_conn package_url]admin/$url ad_script_abort } } @@ -61,10 +61,10 @@ set context [list [list "" "Parties"] "One Party"] attribute::multirow \ - -start_with party \ - -datasource_name attributes \ - -object_type $party_type \ - $party_id + -start_with party \ + -datasource_name attributes \ + -object_type $party_type \ + $party_id # Local variables: