Index: openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql	7 Oct 2007 22:36:54 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/results-users-oracle.xql	28 Apr 2009 14:56:17 -0000	1.3
@@ -24,7 +24,8 @@
                       select 1 from acs_object_party_privilege_map
                       where object_id = :assessment_id
                       and party_id = u.user_id
-                      and privilege = 'read')) a
+                      and privilege = 'read')
+      and acs_group.member_p(u.user_id, :group_id, 't')) a
     left join (select as_sessions.*, cr.item_id
 	       from as_sessions, cr_revisions cr
 	       where session_id in (select max(session_id)
@@ -51,5 +52,6 @@
 
     order by lower(a.title), lower(a.last_name), lower(a.first_names)          
 	</querytext>
-</fullquery>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql	7 Oct 2007 22:36:54 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/results-users-postgresql.xql	28 Apr 2009 14:56:17 -0000	1.4
@@ -24,7 +24,8 @@
                       select 1 from acs_object_party_privilege_map
                       where object_id = :assessment_id
                       and party_id = u.user_id
-                      and privilege = 'read')) a
+                      and privilege = 'read')
+      and acs_group__member_p(u.user_id, :group_id, 't')) a
     left join (select as_sessions.*, cr.item_id
 	       from as_sessions, cr_revisions cr
 	       where session_id in (select max(session_id)
@@ -52,5 +53,6 @@
 
     order by lower(a.title), lower(a.last_name), lower(a.first_names)          
 	</querytext>
-</fullquery>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/assessment/www/asm-admin/results-users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/assessment/www/asm-admin/results-users.adp	22 Feb 2008 23:42:33 -0000	1.7
+++ openacs-4/packages/assessment/www/asm-admin/results-users.adp	28 Apr 2009 14:56:17 -0000	1.8
@@ -3,7 +3,11 @@
 <property name="context">@context;noquote@</property>
 
 <include src="/packages/assessment/lib/section-links" assessment_id="@assessment_id@" tab="results">
+
+<if @status_p@ eq 0>
 <p>@count_all_users@ #assessment.users_in_community#, @count_complete@ #assessment.complete_responses#, @count_incomplete@ #assessment.incomplete_responses#</p>
+</if>
+
 <listfilters name="results" style="inline-filters"></listfilters>
 <listtemplate name="results"></listtemplate>
 
Index: openacs-4/packages/assessment/www/asm-admin/results-users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/results-users.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/assessment/www/asm-admin/results-users.tcl	28 Apr 2009 14:16:13 -0000	1.14
+++ openacs-4/packages/assessment/www/asm-admin/results-users.tcl	28 Apr 2009 14:56:17 -0000	1.15
@@ -23,6 +23,9 @@
 as::assessment::data -assessment_id $assessment_id
 
 set package_id [ad_conn package_id]
+set node_id [ad_conn node_id]
+set group_id [application_group::closest_ancestor_element  -include_self  -node_id $node_id  -element "application_group_id"]
+
 set folder_id [as::assessment::folder_id -package_id $package_id]
 if {![info exists assessment_data(assessment_id)]} {
     ad_return_complaint 1 "[_ assessment.Requested_assess_does]"
@@ -75,10 +78,11 @@
     }
 }
 
-if { [exists_and_not_null status] } {
-    if { $status == "complete" } {
+set status_p [exists_and_not_null status]
+if { $status_p } {
+    if { $status eq "complete" } {
         set whereclause "cs.completed_datetime is not null"
-    } elseif { $status == "incomplete" } {
+    } elseif { $status eq "incomplete" } {
         set whereclause "cs.completed_datetime is null and ns.session_id is not null"
     } else {
         set whereclause "cs.completed_datetime is null and ns.session_id is null"
@@ -145,6 +149,7 @@
 
 template::multirow create subjects subject_id subject_url subject_name
 
+set count_complete 0
 db_multirow -extend { result_url subject_url status delete_url session_score assessment_score percent } results assessment_results {} {
 
     # to display list of users who answered the assessment if anonymous
@@ -166,6 +171,7 @@
         set session_score ""
         set assessment_score ""
     } else {
+        incr count_complete
         set status [_ assessment.Complete]
         set session_score [db_string get_session_score {} -default ""]
         set assessment_score [db_string get_max_points {}]
@@ -199,14 +205,7 @@
         } 
 }
 
-set count_all_users [db_string q "select count(*) from users u
-                                  where u.user_id <> 0 
-                                  and exists (select 1
-                                      from acs_object_party_privilege_map
-                                      where party_id = u.user_id
-                                      and object_id = :assessment_id
-                                      and privilege = 'read')" -default 0]                 
-set count_complete [template::multirow size subjects]
+set count_all_users [template::multirow size results]
 set count_incomplete [expr {$count_all_users - $count_complete}]
 
 ad_return_template