Index: syllabus/syllabus-impl/src/java/org/sakaiproject/component/app/syllabus/SiteEmailNotificationSyllabus.java =================================================================== --- syllabus/syllabus-impl/src/java/org/sakaiproject/component/app/syllabus/SiteEmailNotificationSyllabus.java (revision 371) +++ syllabus/syllabus-impl/src/java/org/sakaiproject/component/app/syllabus/SiteEmailNotificationSyllabus.java (revision 372) @@ -27,6 +27,7 @@ import java.util.ResourceBundle; import java.util.Vector; +import org.sakaiproject.api.app.syllabus.SyllabusAttachment; import org.sakaiproject.api.app.syllabus.SyllabusData; import org.sakaiproject.api.app.syllabus.SyllabusItem; import org.sakaiproject.api.app.syllabus.SyllabusManager; @@ -158,12 +159,35 @@ if (SyllabusService.EVENT_SYLLABUS_POST_NEW.equals(event.getEvent()) || SyllabusService.EVENT_SYLLABUS_POST_CHANGE.equals(event.getEvent())) { - - buf.append(syllabusData.getAsset() + newline); + String content = syllabusData.getAsset(); + + //Set of type SyllabusAttachment + Set attachments = syllabusManager.getSyllabusAttachmentsForSyllabusData(syllabusData); + + //don't let the word 'null' get through to the email + if (content != null) { + buf.append(content + newline + newline); + } + + if (attachments != null && attachments.size() > 0) { + buf.append(rb.getString("syllabus.attachments.list") + newline); + buf.append("" + newline); + } } else if (SyllabusService.EVENT_SYLLABUS_DELETE_POST.equals(event.getEvent())) { - buf.append(" Syllabus Item - "); buf.append(syllabusData.getTitle()); buf.append(" for Site - "); Index: syllabus/syllabus-impl/src/bundle/siteemacon.properties =================================================================== --- syllabus/syllabus-impl/src/bundle/siteemacon.properties (revision 371) +++ syllabus/syllabus-impl/src/bundle/siteemacon.properties (revision 372) @@ -29,3 +29,5 @@ this = This automatic notification message was sent by youcan = You can modify how you receive notifications at My Workspace > Preferences. + +syllabus.attachments.list = Attachments: