Index: openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl	2 Feb 2005 21:31:15 -0000	1.3
+++ openacs-4/packages/assessment/www/asm-admin/checks-admin.tcl	2 Feb 2005 23:09:05 -0000	1.4
@@ -8,7 +8,7 @@
     assessment_id:integer
     section_id
     item_id:optional
-    
+      
 }
 
 set package_id [ad_conn package_id]
@@ -20,30 +20,36 @@
 set show_p 1
 set by_item_p 0
 set item_p ""
+set item_id_check ""
 
 if {[exists_and_not_null item_id]} {
-    set show_p 0
     set by_item_p 1
     set item_p "&item_id=$item_id"
+    set item_id_check $item_id
     set check_list "and c.inter_item_check_id in ("
     set checks [db_list_of_lists get_all_checks { }]
+    set count  0
     
     foreach check $checks {
 	set cond_list  [split [lindex $check 1] "="]
 	set as_item_id [lindex [split [lindex $cond_list 2] " "] 0]
 	if { $item_id == $as_item_id} {
+	    incr count
 	    append check_list "[lindex $check 0],"
 	}
 	
     } 
+    if {$count == 0} {
+	append check_list "0,"
+    }
     set check_list [string range $check_list 0 [expr [string length $check_list] -2]]
     append  check_list ")"
 } 
 
-db_multirow aa_checks get_aa_checks {} 
-db_multirow i_checks  get_i_checks {}    
-db_multirow branches  get_branches {}
-db_multirow m_checks  get_m_checks {}
+db_multirow  aa_checks get_aa_checks {}  
+db_multirow  i_checks  get_i_checks {}  
+db_multirow  branches  get_branches {} 
+db_multirow  m_checks  get_m_checks {} 
 
 
 if {![info exists assessment_data(assessment_id)]} {
@@ -65,10 +71,11 @@
     }\
     -bulk_action_method post \
     -bulk_action_export_vars {
-	inter_item_check_id
 	assessment_id
 	section_id
 	{type_check t}
+	item_id_check
+	by_item_p
     }\
     -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \
     -elements {
@@ -109,10 +116,12 @@
     }\
     -bulk_action_method post \
     -bulk_action_export_vars {
-	inter_item_check_id
 	assessment_id
 	section_id
 	{type_check t}
+	item_id_check
+	by_item_p
+
     }\
     -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \
     -elements {
@@ -152,10 +161,12 @@
     }\
     -bulk_action_method post \
     -bulk_action_export_vars {
-	inter_item_check_id
 	assessment_id
 	section_id
 	{type_check t}
+	item_id_check
+	by_item_p
+	
     }\
     -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \
     -elements {
@@ -185,10 +196,12 @@
     }\
     -bulk_action_method post \
     -bulk_action_export_vars {
-	inter_item_check_id
 	assessment_id
 	section_id
 	{type_check f}
+	item_id_check
+	by_item_p
+
     }\
     -row_pretty_plural "[_ assessment.Assessment] [_ assessment.triggers]" \
     -elements {
Index: openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl	1 Feb 2005 22:00:10 -0000	1.1
+++ openacs-4/packages/assessment/www/asm-admin/checks-delete.tcl	2 Feb 2005 23:09:05 -0000	1.2
@@ -6,6 +6,8 @@
     inter_item_check_id:multiple
     section_id
     assessment_id
+    by_item_p
+    item_id:optional
   }
 set count [llength $inter_item_check_id]
 
@@ -15,4 +17,8 @@
 	db_exec_plsql delete_check {}
     }
 }
-ad_returnredirect "checks-admin?assessment_id=$assessment_id&section_id=$section_id"
\ No newline at end of file
+if {$by_item_p == 1} {
+    ad_returnredirect "checks-admin?section_id=$section_id&assessment_id=$assessment_id&by_item_p=$by_item_p&item_id=$item_id"
+} else {
+    ad_returnredirect "checks-admin?section_id=$section_id&assessment_id=$assessment_id&by_item_p=$by_item_p"
+}
\ No newline at end of file
Index: openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl	2 Feb 2005 21:31:15 -0000	1.2
+++ openacs-4/packages/assessment/www/asm-admin/confirm-delete.tcl	2 Feb 2005 23:09:05 -0000	1.3
@@ -6,19 +6,24 @@
     inter_item_check_id:multiple
     section_id
     assessment_id
+    by_item_p:integer
+    item_id_check:optional
 }
 
+
 set package_id [ad_conn package_id]
 permission::require_permission -object_id $package_id -privilege create
 permission::require_permission -object_id $assessment_id -privilege admin
 as::assessment::data -assessment_id $assessment_id
 set title "$assessment_data(title)"
+
 set context [list [list "one-a?assessment_id=$assessment_id" $title] [list "checks-admin?assessment_id=$assessment_id&section_id=$section_id" "$title [_ assessment.Administration]"] "[_ assessment.trigger_delete]"]
 
+
 set title "[_ assessment.trigger_delete]"
 
-ad_form -name delete_checks -form {
-
+ad_form -name delete_checks -export {by_item_p item_id_check} -form {
+    
     {inter_item_check_id:text(hidden) 
 	{value $inter_item_check_id}
     }
@@ -28,6 +33,13 @@
     {assessment_id:text(hidden) 
 	{value $assessment_id}
     }
-} -on_submit {
-    ad_returnredirect "checks-delete?section_id=$section_id&inter_item_check_id=$inter_item_check_id&assessment_id=$assessment_id"
+}  -after_submit {
+    
+    if {$by_item_p == 1} {
+	ad_returnredirect "checks-delete?section_id=$section_id&inter_item_check_id=$inter_item_check_id&assessment_id=$assessment_id&by_item_p=$by_item_p&item_id=$item_id_check"
+    } else {
+	ad_returnredirect "checks-delete?section_id=$section_id&inter_item_check_id=$inter_item_check_id&assessment_id=$assessment_id&by_item_p=$by_item_p"
+    }
+    
+    
 }