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 -r1.17 -r1.18 --- openacs-4/packages/acs-subsite/www/permissions/one.tcl 15 Jun 2015 11:14:19 -0000 1.17 +++ openacs-4/packages/acs-subsite/www/permissions/one.tcl 7 Aug 2017 23:47:59 -0000 1.18 @@ -8,7 +8,7 @@ @creation-date 2000-08-20 @cvs-id $Id$ } { - object_id:naturalnum,notnull + object_id:integer,notnull {children_p:boolean "f"} {application_url ""} } @@ -28,38 +28,42 @@ set name [db_string name {}] -set context [list [list "./" [_ acs-subsite.Permissions]] [ad_quotehtml [_ acs-subsite.Permissions_for_name]]] +set context [list [list "./" [_ acs-subsite.Permissions]] [_ acs-subsite.Permissions_for_name]] -db_multirow inherited inherited_permissions { *SQL* } { -} +db_multirow inherited inherited_permissions {} {} -db_multirow acl acl { *SQL* } { -} +db_multirow acl acl {} {} set controls [list] set controlsUrl [export_vars -base grant {application_url object_id}] lappend controls "[ns_quotehtml [_ acs-subsite.Grant_Permission]]" -db_1row context { *SQL* } +db_1row context {} set context_name [lang::util::localize $context_name] set toggleUrl [export_vars -base toggle-inherit {application_url object_id}] if { $security_inherit_p == "t" && $context_id ne "" } { - lappend controls "Don't Inherit Permissions from [ad_quotehtml $context_name]" + lappend controls "Don't Inherit Permissions from [ns_quotehtml $context_name]" } else { lappend controls "Inherit Permissions from [ns_quotehtml $context_name]" } -set controls "\[ [join $controls " | "] \]" +set controls "\[ [join $controls { | }] \]" set export_form_vars [export_vars -form {object_id application_url}] set show_children_url [export_vars -base one {object_id application_url {children_p t}}] set hide_children_url [export_vars -base one {object_id application_url {children_p f}}] if {$children_p == "t"} { - db_multirow children children { *SQL* } { + db_multirow children children {} { } } else { - db_1row children_count { *SQL* } + db_1row children_count {} } + +# Local variables: +# mode: tcl +# tcl-indent-level: 4 +# indent-tabs-mode: nil +# End: