Index: openacs-4/packages/acs-subsite/www/permissions/one.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/one.tcl,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/acs-subsite/www/permissions/one.tcl 9 May 2018 15:33:28 -0000 1.20 +++ openacs-4/packages/acs-subsite/www/permissions/one.tcl 20 Jun 2018 09:56:19 -0000 1.21 @@ -26,20 +26,28 @@ } -set name [db_string name {}] +acs_object::get -object_id $object_id -array obj +set name $obj(object_name) +set context_id $obj(context_id) +set security_inherit_p $obj(security_inherit_p) set context [list [list "./" [_ acs-subsite.Permissions]] [_ acs-subsite.Permissions_for_name]] db_multirow inherited inherited_permissions {} {} -db_multirow acl acl {} {} +db_multirow -extend {grantee_name} acl acl { + select grantee_id, privilege + from acs_permissions + where object_id = :object_id +} { + set grantee_name [party::name -party_id $grantee_id] +} set controls [list] set controlsUrl [export_vars -base grant {application_url object_id}] lappend controls "[ns_quotehtml [_ acs-subsite.Grant_Permission]]" -db_1row context {} -set context_name [lang::util::localize $context_name] +set context_name [lang::util::localize [acs_object_name $context_id]] set toggleUrl [export_vars -base toggle-inherit {application_url object_id}] if { $security_inherit_p == "t" && $context_id ne "" } {