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 -N -r1.6 -r1.6.2.1 --- openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 7 Aug 2017 23:47:58 -0000 1.6 +++ openacs-4/packages/acs-subsite/www/admin/groups/elements-display-list.tcl 16 May 2019 09:46:36 -0000 1.6.2.1 @@ -1,28 +1,28 @@ -# /packages/acs-subsite/www/admin/groups/elements-display.tcl +ad_include_contract { -if { ![info exists group_id] || $group_id eq "" } { - error "Group must be specified" -} + List elements of group/rel_type -if { ![info exists rel_type] || $rel_type eq "" } { - error "Rel type must be specified" +} { + {group_id:integer,notnull} + {rel_type:notnull} + {member_state "approved" } 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]"] } -if {![info exists member_state]} { - set member_state "approved" -} - set user_id [ad_conn user_id] -# We need to know both: +# We need to know both: # - does user have admin on group? # - does user have delete on group? -set admin_p [permission::permission_p -party_id $user_id -object_id $group_id -privilege "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 @@ -39,8 +39,8 @@ set extra_where_clauses "" if {$ancestor_rel_type eq "membership_rel"} { if {$member_state ne ""} { - set extra_tables "membership_rels mr," - set extra_where_clauses { + set extra_tables "membership_rels mr," + set extra_where_clauses { and mr.rel_id = rels.rel_id and mr.member_state = :member_state} } @@ -53,13 +53,13 @@ set base_url [export_vars -base [ad_conn package_url]admin/groups/elements-display {group_id rel_type}] template::multirow create possible_member_states \ - val label url + val label url template::multirow append possible_member_states \ - "" "all" $base_url + "" "all" $base_url foreach state [group::possible_member_states] { template::multirow append possible_member_states \ - $state $state $base_url&member_state=[ad_urlencode $state] + $state $state $base_url&member_state=[ad_urlencode $state] }