Index: openacs-4/packages/assessment/lib/session.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.adp,v
diff -u -N -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/assessment/lib/session.adp	5 Feb 2007 14:10:42 -0000	1.5.2.1
+++ openacs-4/packages/assessment/lib/session.adp	5 Feb 2007 17:29:42 -0000	1.5.2.2
@@ -5,7 +5,7 @@
 <tr>
 <th colspan="3" align=left>#assessment.Assessment#: <a href="assessment?assessment_id=@assessment_id@">@assessment_data.title@</a></th></tr>
 <tr><td nowrap><b>#assessment.User_ID#:</b> <span><if @show_username_p@><a href="@session_user_url@">@first_names@ @last_name@</a><if @assessment_data.anonymous_p@ eq "t"><br />#assessment.lt_bNoteb_This_assessmen#</if></if><else>#assessment.anonymous_name#</else></span></td>
-<td nowrap><b>#assessment.Attempt#:</b> <multiple name="session_attempts"><if @session_attempts.session_id@ eq @session_id@><b>@session_attempts.rownum@</b></if><else><a href="session?session_id=@session_attempts.session_id@">@session_attempts.rownum@</a></else>&nbsp;&nbsp; </multiple></td>
+<td nowrap><b>#assessment.Attempt#:</b> <multiple name="session_attempts"><if @session_attempts.session_id@ eq @session_id@><b>@session_attempts.rownum@</b></if><else><a href="session?session_id=@session_attempts.session_id@">@session_attempts.rownum@</a></else>&nbsp;&nbsp; </multiple> <if @admin_p@> (<a href="@delete_url@">#assessment.Delete_Attempts#</a>)</if></td>
 <td nowrap><if @assessment_data.survey_p@ ne t> <if @showpoints@ eq 1> <b>#assessment.Percent_Score#:</b>  <span>@percent_score@</span></if></if> </td></tr>
 
 <tr><td><b>#assessment.Started#:</b> <span>@session_start@</span></td>
Index: openacs-4/packages/assessment/lib/session.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/lib/session.tcl,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/assessment/lib/session.tcl	26 Sep 2006 04:08:36 -0000	1.4
+++ openacs-4/packages/assessment/lib/session.tcl	5 Feb 2007 17:29:42 -0000	1.4.2.1
@@ -40,7 +40,10 @@
 if {$subject_id != $user_id} {
     permission::require_permission -object_id $assessment_id -privilege admin
 }
-
+set admin_p [permission::permission_p \
+                 -object_id $session_id \
+                 -privilege admin \
+                 -party_id $user_id]
 set page_title "[_ assessment.View_Results]"
 set context_bar [ad_context_bar [list [export_vars -base sessions {assessment_id}] "[_ assessment.Show_Sessions]"] $page_title]
 set format "[lc_get formbuilder_date_format], [lc_get formbuilder_time_format]"
@@ -84,4 +87,6 @@
 
 set comments_installed_p [apm_package_enabled_p "general-comments"]
 
+set delete_url [export_vars -base asm-admin/session-delete {assessment_id subject_id session_id {return_url [ad_return_url]}}]
+
 ad_return_template
Index: openacs-4/packages/assessment/www/asm-admin/session-delete.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/session-delete.xql,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/assessment/www/asm-admin/session-delete.xql	8 Dec 2006 03:23:08 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/session-delete.xql	5 Feb 2007 17:29:42 -0000	1.1.2.1
@@ -13,8 +13,9 @@
     <fullquery name="count_sessions">
         <querytext>
             select count(*) 
-            from as_sessions 
-            where assessment_id=:assessment_id
+            from as_sessions, cr_revisions
+            where item_id=:assessment_id
+            and assessment_id=revision_id
             and subject_id=:subject_id
         </querytext>
     </fullquery>