Index: openacs-4/packages/faq-portlet/www/faq-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/faq-portlet/www/faq-portlet.adp	7 May 2002 17:53:44 -0000	1.8
+++ openacs-4/packages/faq-portlet/www/faq-portlet.adp	1 Jun 2002 21:00:52 -0000	1.9
@@ -20,7 +20,7 @@
 
 <if @shaded_p@ ne "t">
 
-  <if @faqs:rowcount@ gt 0>
+  <if @faqs:rowcount@ gt 1>
 
 <%
     set new_package_id ""
@@ -60,10 +60,9 @@
       </tr>
     </else>
 
-<%
-    set old_package_id $new_package_id
-%>
+<% set old_package_id $new_package_id %>
 
+</else>
     <if @one_instance_p@ false and @new_package_id@ ne @old_package_id@>
       </tr>
     </if>
@@ -75,7 +74,17 @@
 
   </if>
   <else>
-    <small>No FAQs</small>
+    <if @faqs:rowcount@ eq 1>
+      @faq_name@
+      <ul>
+<multiple name="questions">
+        <li><a href="@faq_url@one-question?entry_id=@questions.entry_id@">@questions.question@</a></li>
+</multiple>
+      </ul>
+    </if>
+    <else>
+      <small>No FAQs</small>
+    </else>
   </else>
 
 </if>
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.12 -r1.13
--- openacs-4/packages/faq-portlet/www/faq-portlet.tcl	6 Apr 2002 23:41:34 -0000	1.12
+++ openacs-4/packages/faq-portlet/www/faq-portlet.tcl	1 Jun 2002 21:00:52 -0000	1.13
@@ -31,3 +31,22 @@
 set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
 
 db_multirow faqs select_faqs {}
+
+if {${faqs:rowcount} == 1} {
+    set faq_name [lindex [array get {faqs:1} faq_name] 1]
+    set parent_name [lindex [array get {faqs:1} parent_name] 1]
+    set faq_url [lindex [array get {faqs:1} url] 1]
+    set faq_id [lindex [array get {faqs:1} faq_id] 1]
+
+    db_multirow questions select_faq_questions {
+        select entry_id,
+               faq_id,
+               question,
+               answer,
+               sort_key 
+        from faq_q_and_as 
+        where faq_id = :faq_id
+        order by sort_key
+    }
+
+}