Index: openacs-4/packages/survey-portlet/www/survey-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/www/survey-portlet.adp,v
diff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2
--- openacs-4/packages/survey-portlet/www/survey-portlet.adp	1 Jun 2004 20:13:46 -0000	1.1.1.1.8.1
+++ openacs-4/packages/survey-portlet/www/survey-portlet.adp	30 Sep 2004 20:33:24 -0000	1.1.1.1.8.2
@@ -18,26 +18,23 @@
 
 %>
 
-<if @can_read_private_data_p@>
-
-<if @surveys:rowcount@ gt 0>
+<if @surveys:rowcount@ gt 0 and @readable_surveys_p@ eq 1>
 	<multiple name="surveys">
-<if @one_instance_p@ false>@surveys.parent_name@
-<ul></if>
+<if @one_instance_p@ false>@surveys.parent_name@</if>
+<ul>
 
 <group column="package_id">
-    <if @surveys.response_count@ eq 0>
+    <if @surveys.response_count@ eq 0 and @surveys.can_read_private_data_p@>
 	  <li>
 	  <a href="@surveys.url@one-survey?survey_id=@surveys.survey_id@">@surveys.name@</a>
           </li>
     </if>
 </group>
 </ul>
-     <if @one_instance_p@><br /></if><a href="@surveys.url@">view/edit previous responses<if @one_instance_p@ eq 0> for surveys in this group</if></a><br /><br />
+     <if @one_instance_p@><br /></if><if @surveys.can_read_private_data_p@><a href="@surveys.url@">view/edit previous responses<if @one_instance_p@ eq 0> for surveys in this group</if></a><br /></if><br />
     </multiple>
 </if>      
-      <if @surveys:rowcount@ eq 0>
-	<li>No unanswered surveys</li>
-      </if>
 <else>
+	<small>No unanswered surveys</small>
+</else>
 </if>
Index: openacs-4/packages/survey-portlet/www/survey-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/www/survey-portlet.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.8.1
--- openacs-4/packages/survey-portlet/www/survey-portlet.tcl	14 May 2003 21:07:00 -0000	1.1.1.1
+++ openacs-4/packages/survey-portlet/www/survey-portlet.tcl	30 Sep 2004 20:33:24 -0000	1.1.1.1.8.1
@@ -19,9 +19,14 @@
 set shaded_p $config(shaded_p)
 set list_of_package_ids $config(package_id)
 
-set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
-set can_read_private_data_p [acs_privacy::user_can_read_private_data_p -object_id [ad_conn package_id]]
 set user_id [ad_conn user_id]
-db_multirow surveys select_surveys {}
-
-
+set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0]
+set readable_surveys_p 0
+set count 0
+db_multirow -extend {can_read_private_data_p} surveys select_surveys {} {
+  set can_read_private_data_p [acs_privacy::user_can_read_private_data_p -object_id $package_id]
+  if { $can_read_private_data_p } {
+    set readable_surveys_p 1
+  }
+  incr count
+}