SAK-29239 Changed to just use the list, fixed a property based on cod…

…e review
yuyilin · Jun 17, 2015 · b8d72f2 · b8d72f2
1 parent 2c75e65
commit b8d72f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/assignment/assignment-bundles/resources/assignment.properties b/assignment/assignment-bundles/resources/assignment.properties
@@ -903,7 +903,7 @@ content_review.accepted.types.delimiter=,
 content_review.accepted.types.lparen=(
 content_review.accepted.types.rparen=)
 
-noti.releaseresubmission.subject.content=Email notification for assignment
+noti.releaseresubmission.subject.content=Assignment submission has been corrected
 noti.releaseresubmission.text=Your submission to assignment "{0}" has been corrected and it allows resubmissions until the due date. Please go to {1} to view details.
 noti.releaseresubmission.noresubmit.text=Your submission to assignment "{0}" has been corrected. Please go to {1} to view details.
 

diff --git a/...assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java b/...assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java
@@ -2979,9 +2979,9 @@ private String htmlContentReleaseResubmission(AssignmentSubmission s){
 		buffer.append(rb.getString("noti.site.title") + " " + siteTitle + newline);
 		buffer.append(rb.getString("noti.site.url") + " <a href=\""+ siteUrl+ "\">" + siteUrl + "</a>"+ newline);
 		// notification text
-		//Get the actual person that submitted, for a group submission just get anyone from that group
-		String userId = s.getSubmitterId();
-		if (a != null && a.isGroup()) {
+		//Get the actual person that submitted, for a group submission just get the first person from that group (This is why the array is used)
+		String userId = null;
+		if (s.getSubmitterIds() != null && s.getSubmitterIds().size() > 0) {
 		    userId = (String) s.getSubmitterIds().get(0);
 		}
 		if (canSubmit(context,a,userId)) {