Index: openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.adp	4 Feb 2006 14:35:48 -0000	1.1
+++ openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.adp	6 Feb 2006 16:01:07 -0000	1.2
@@ -1,5 +1,5 @@
   <listtemplate name="assessments"></listtemplate>
-  <if @package_admin_p@ and @community_id@ ne "">
+  <if @package_admin_p@ defined and @package_admin_p@ eq 1 and @community_id@ ne "">
     <p />
     <br />
     #ae-portlet.lt_NOTE_This_is_an_admin#
Index: openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl	4 Feb 2006 14:35:48 -0000	1.1
+++ openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.tcl	6 Feb 2006 16:01:07 -0000	1.2
@@ -40,7 +40,6 @@
     -multirow assessments \
     -page_flush_p 1 \
     -html { width 100% } \
-    -pass_properties { package_admin_p } \
     -no_data "#ae-portlet.lt_No_evaluations_presen#" \
     -elements {
 	title {
@@ -61,9 +60,9 @@
 		<else>
 		<a href="@assessments.assessment_url;noquote@">#ae-portlet.Take_Evaluation#</a>
 		</else>		    
-		<br />#ae-portlet.Anonymous# <if @package_admin_p@><if @assessments.anonymous_p@ eq "f"><a href="@assessments.anonymous_url;noquote@">#assessment.yes#</a>/<b>#assessment.no#</b></if><else><b>#assessment.yes#</b>/<a href="@assessments.anonymous_url;noquote@">#assessment.no#</a></else>
+		<br />#ae-portlet.Anonymous# <if @assessments.package_admin_p@><if @assessments.anonymous_p@ eq "f"><a href="@assessments.anonymous_url;noquote@">#assessment.yes#</a>/<b>#assessment.no#</b></if><else><b>#assessment.yes#</b>/<a href="@assessments.anonymous_url;noquote@">#assessment.no#</a></else>
 		</if><else><if @assessments.anonymous_p@ eq "f"><b>#assessment.no#</b></if><else><b>#assessment.yes#</b></else></else>
-		<if @package_admin_p@>
+		<if @assessments.package_admin_p@>
 		| <a href="@assessments.status_url;noquote@">#ae-portlet.Unpublish#</a> | <a href="@assessments.edit_url;noquote@">#ae-portlet.Edit_Evaluation#</a> | <a href="@assessments.results_url;noquote@">#ae-portlet.Results#</a>
 		</if>
 	    }
@@ -72,7 +71,7 @@
     -groupby $groupby_list
 
 set status_clause "and not ci.live_revision is null"
-db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url } assessments answered_assessments {} {
+db_multirow -extend { edit_response_url view_url edit_url assessment_url status_url anonymous_url edit_url results_url package_admin_p } assessments answered_assessments {} {
 
     set base_url [site_node::get_url_from_object_id -object_id $package_id]
     set package_admin_p [permission::permission_p -party_id $user_id -object_id $package_id -privilege "admin"]
Index: openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql	4 Feb 2006 14:35:48 -0000	1.1
+++ openacs-4/packages/ae-portlet/lib/ae-portlet-chunk.xql	6 Feb 2006 16:01:07 -0000	1.2
@@ -8,8 +8,14 @@
 	       sc.node_id as comm_node_id, sa.node_id as as_node_id,
 	       s.session_id, s.completed_datetime, a.anonymous_p, 
 	       a.assessment_id as assessment_rev_id
-	from as_assessments a left join as_sessions s on (a.assessment_id = s.assessment_id
-							  and s.subject_id = :user_id), 
+	from as_assessments a 
+	left join as_sessions s
+	on (a.assessment_id = s.assessment_id
+	    and s.subject_id = :user_id
+	    and not s.subject_id in (select grantee_id 
+		 		     from acs_permissions_all 
+				     where privilege = 'admin' 
+				     and object_id in ([join $list_of_package_ids ", "]))), 
 	     cr_revisions cr, cr_items ci, cr_folders cf,
 	     site_nodes sa, site_nodes sc, apm_packages p
 	where a.assessment_id = cr.revision_id
@@ -19,7 +25,9 @@
 	and sa.object_id = cf.package_id
 	and sc.node_id = sa.parent_id
 	and p.package_id = sc.object_id
+
 	$status_clause	
+
 	order by lower(p.instance_name), lower(cr.title)
 	</querytext>
 </fullquery>