Fix JENKINS-13192 for text template

- Fixed the author issue for the text template as well.
jenkinsci · Jul 18, 2012 · 86f5f9e · 86f5f9e
1 parent f9c9479
commit 86f5f9e
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/resources/hudson/plugins/emailext/templates/groovy-text.template b/src/main/resources/hudson/plugins/emailext/templates/groovy-text.template
@@ -12,14 +12,22 @@ if(changeSet != null) {
   def hadChanges = false %>
 CHANGE SET
 <% changeSet.each() { cs ->
-     hadChanges = true
-  	 def aUser = cs.hudsonUser %>
-  	 Revision <%= cs.metaClass.hasProperty('commitId') ? cs.commitId : cs.metaClass.hasProperty('revision') ? cs.revision : cs.changeNumber %> by <%= aUser != null ? aUser.displayName : cs.author.displayName %>: (<%= cs.msgAnnotated %>)
+     hadChanges = true %>
+  	 Revision <%= cs.metaClass.hasProperty('commitId') ? cs.commitId : cs.metaClass.hasProperty('revision') ? cs.revision : 
+        cs.metaClass.hasProperty('changeNumber') ? cs.changeNumber : "" %> by <%= cs.author %>: (<%= cs.msgAnnotated %>)
 <%	 cs.affectedFiles.each() { p -> %>
 	 change: <%= p.editType.name %> <%= p.path %>
 <%   }	 	    
    }
   if(!hadChanges) { %>
   No changes
 <% }
-} %>
+} %>
+
+
+<% if(build.result==hudson.model.Result.FAILURE) { %>
+CONSOLE OUTPUT
+<% 	build.getLog(100).each() { line -> %>
+	${line}
+<% 	}
+   } %>