Index: openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl,v diff -u -r1.10.2.1 -r1.10.2.2 --- openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl 7 Feb 2020 08:44:05 -0000 1.10.2.1 +++ openacs-4/packages/xowiki-portlet/www/xowiki-admin-portlet.tcl 17 Jan 2023 10:24:00 -0000 1.10.2.2 @@ -40,19 +40,20 @@ -parameter xowiki_admin_portlet_element_pretty_name \ -default [_ xowiki-portlet.admin_portlet_element_pretty_name]] -db_multirow content select_content \ - "select m.element_id, m.pretty_name, pep.value as name +::xo::dc multirow -prepare integer content select_content [subst { + select m.element_id, m.pretty_name, pep.value as name from portal_element_map m, portal_pages p, portal_element_parameters pep where m.page_id = p.page_id - and p.portal_id = $template_portal_id + and p.portal_id = :template_portal_id and m.datasource_id = [portal::get_datasource_id [xowiki_portlet name]] - and pep.element_id = m.element_id and pep.key = 'page_name'" {} + and pep.element_id = m.element_id and pep.key = 'page_name' +}] # don't ask to insert same page twice template::multirow foreach content {set used_page_id($name) 1} set options "" -db_foreach instance_select \ +::xo::dc foreach instance_select \ [::xowiki::Page instance_select_query \ -folder_id [::$xowiki_package_id folder_id] \ -with_subtypes true \