Index: openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 10 Jan 2007 21:22:07 -0000 1.2 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 27 Oct 2014 16:39:51 -0000 1.3 @@ -1,14 +1,14 @@ # /packages/acs-subsite/www/admin/groups/elements-display.tcl -if { ![exists_and_not_null group_id] } { +if { (![info exists group_id] || $group_id eq "") } { error "Group must be specified" } -if { ![exists_and_not_null rel_type] } { +if { (![info exists rel_type] || $rel_type eq "") } { error "Rel type must be specified" } -if { ![exists_and_not_null return_url_enc] } { +if { (![info exists return_url_enc] || $return_url_enc eq "") } { # Default return url to the current page set return_url_enc [ad_urlencode "[ad_conn url]?[ad_conn query]"] } @@ -22,13 +22,13 @@ # We need to know both: # - does user have admin on group? # - does user have delete on group? -set admin_p [ad_permission_p -user_id $user_id $group_id "admin"] +set admin_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "admin"] if {$admin_p} { # We can skip the permissions check for "delete" because user had admin. set delete_p 1 } else { # user doesn't have admin -- now find out if they have delete. - set delete_p [ad_permission_p -user_id $user_id $group_id "delete"] + set delete_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "delete"] } # Pull out all the relations of the specified type @@ -72,7 +72,7 @@ # Build the member state dimensional slider -set base_url [ad_conn package_url]admin/groups/elements-display?[ad_export_vars {group_id rel_type}] +set base_url [ad_conn package_url]admin/groups/elements-display?[export_vars {group_id rel_type}] template::multirow create possible_member_states \ val label url