Index: openacs-4/packages/acs-subsite/lib/applications.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/applications.tcl,v diff -u -N -r1.6.10.2 -r1.6.10.3 --- openacs-4/packages/acs-subsite/lib/applications.tcl 1 Jul 2016 13:47:06 -0000 1.6.10.2 +++ openacs-4/packages/acs-subsite/lib/applications.tcl 2 Jul 2016 11:51:06 -0000 1.6.10.3 @@ -2,7 +2,11 @@ set actions [list] if { $admin_p } { - lappend actions [_ acs-subsite.Add_new_app] [export_vars -base "[subsite::get_element -element url]admin/applications/application-add" { { return_url [ad_return_url] } }] {} + lappend actions \ + [_ acs-subsite.Add_new_app] \ + [export_vars -base "[subsite::get_element -element url]admin/applications/application-add" { + { return_url [ad_return_url] } + }] } list::create \ @@ -21,25 +25,7 @@ set user_id [ad_conn user_id] -db_multirow applications select_applications { - select p.package_id, - p.instance_name, - n.node_id, - n.name - from site_nodes n, - apm_packages p, - apm_package_types t - where n.parent_id = :subsite_node_id - and p.package_id = n.object_id - and t.package_key = p.package_key - and t.package_type = 'apm_application' - and exists (select 1 - from acs_object_party_privilege_map perm - where perm.object_id = p.package_id - and perm.privilege = 'read' - and perm.party_id = :user_id) - order by upper(instance_name) -} +db_multirow applications select_applications {} # Local variables: