Index: openacs-4/packages/faq-portlet/www/faq-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/faq-portlet/www/faq-portlet.tcl 7 Aug 2017 23:48:11 -0000 1.19 +++ openacs-4/packages/faq-portlet/www/faq-portlet.tcl 18 Jun 2018 15:36:50 -0000 1.20 @@ -40,7 +40,22 @@ } } -db_multirow -extend { faq_url } faqs select_faqs {} { +db_multirow -extend { faq_url parent_name url } faqs select_faqs [subst { + select f.faq_id, + f.faq_name, + o.context_id as package_id + from faqs f, + acs_objects o + where f.faq_id = o.object_id + and not f.disabled_p + and o.object_id in ([join $list_of_package_ids ", "]) + order by lower(faq_name) +}] { + set node [site_node::get_from_object_id -object_id $package_id] + set url [dict get $node url] + set parent_node [site_node::get -node_id [dict get $node parent_id]] + set parent_name [acs_object_name [dict get $parent_node object_id]] + set faq_url [export_vars -base "${url}one-faq" {faq_id}] }