Index: openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql	7 Aug 2017 23:48:04 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/send-mail-postgresql.xql	29 May 2018 17:54:36 -0000	1.4
@@ -5,10 +5,7 @@
 
     <partialquery name="all">
 	<querytext>
-            select '[db_quote $sender_email]' as from_addr,
-               '[db_quote $sender_first_names]' as sender_first_names,
-               '[db_quote $sender_last_name]' as sender_last_name,
-               parties.email,
+            select parties.email,
 	       (case acs_objects.object_type
 	       	     when 'user' then 
                       (select first_names
@@ -37,17 +34,13 @@
             parties.party_id <> 0
             and parties.party_id = users.user_id        
             and parties.party_id = acs_objects.object_id
-	    and acs_permission__permission_p(:assessment_id, parties.party_id, 'read')
-
+            and parties.party_id in (select party_id from acs_permission.parties_with_object_privilege(:assessment_id, 'read'))
 	</querytext>
     </partialquery>
 
     <partialquery name="responded">
 	<querytext>
- 		select '[db_quote $sender_email]' as from_addr,
-               '[db_quote $sender_first_names]' as sender_first_names,
-               '[db_quote $sender_last_name]' as sender_last_name,
-               parties.email,
+ 		select parties.email,
 	       (case acs_objects.object_type
 	       	     when 'user' then 
                       (select first_names
@@ -86,10 +79,7 @@
 
     <partialquery name="not_responded">
 	<querytext>
-		select '[db_quote $sender_email]' as from_addr,
-               '[db_quote $sender_first_names]' as sender_first_names,
-               '[db_quote $sender_last_name]' as sender_last_name,
-               parties.email,
+		select parties.email,
 	       (case acs_objects.object_type
 	       	     when 'user' then 
                       (select first_names
@@ -109,9 +99,7 @@
                       (select last_name
                        from persons
                        where person_id = parties.party_id)
-		     else '' end) as last_name,
-               '[db_quote $community_name]' as community_name,
-               '[db_quote $community_url]' as community_url
+		     else '' end) as last_name
             from 
                  parties,
                  acs_objects,
@@ -126,38 +114,8 @@
 		where s.assessment_id = r.revision_id
 		and s.completed_datetime is not null
 		and r.item_id = :assessment_id)
-		and acs_permission__permission_p(:assessment_id, parties.party_id, 'read')
-
+            and parties.party_id in (select party_id from acs_permission.parties_with_object_privilege(:assessment_id, 'read'))
 	</querytext>
     </partialquery>
-
-    <partialquery name="responded">
-	<querytext>
- 		select '[db_quote $sender_email]' as from_addr,
-               '[db_quote $sender_first_names]' as sender_first_names,
-               '[db_quote $sender_last_name]' as sender_last_name,
-               parties.email
-            from parties
-            where
-                parties.party_id in (
-		select s.subject_id
-		from as_sessions s, cr_revisions r
-		where s.assessment_id = r.revision_id
-		and s.completed_datetime is not null
-		and r.item_id = :assessment_id)
-	</querytext>
-    </partialquery>
-
-    <partialquery name="list_of_user_ids">
-	<querytext>
- 		select '[db_quote $sender_email]' as from_addr,
-               '[db_quote $sender_first_names]' as sender_first_names,
-               '[db_quote $sender_last_name]' as sender_last_name,
-               parties.email
-            from parties
-            where
-                parties.party_id in ([template::util::tcl_to_sql_list $user_ids])
-	</querytext>
-    </partialquery>
     
 </queryset>