Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/sakai-2.7.1/sam:r92056
   Merged /msub/iu.edu/oncourse/trunk:r98422
   Merged /msub/iu.edu/oncourse/trunk/sam:r90346,98422


Property changes on: docs/conversion
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /msub/iu.edu/oncourse/sakai-2.7.1/sam/docs/conversion:r92056
   Merged /msub/iu.edu/oncourse/trunk/sam/docs/conversion:r90346,98422

Index: samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/SubmitToGradingActionListener.java
===================================================================
--- samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/SubmitToGradingActionListener.java	(revision 98954)
+++ samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/delivery/SubmitToGradingActionListener.java	(working copy)
@@ -574,6 +574,15 @@
 			ItemContentsBean item, HashSet adds, HashSet removes) {
 		ArrayList grading = item.getItemGradingDataArray();
 		int typeId = item.getItemData().getTypeId().intValue();
+		
+		//no matter what kinds of type questions, if it marks as review, add it in. (ONC-4069)
+		for (int m = 0; m < grading.size(); m++) {
+			ItemGradingData itemgrading = (ItemGradingData) grading.get(m);
+			if (itemgrading.getReview() == true) {
+				adds.addAll(grading);
+			} 
+		}
+		
 		// 1. add all the new itemgrading for MC/Survey and discard any
 		// itemgrading for MC/Survey
 		// 2. add any modified SAQ/TF/FIB/Matching/MCMR/Audio/FIN