Fix JENKINS-13192

- husdonUser doesn't exist, use author directly - changeNumber doesn't exist, add check whether the property exist, otherwise show space - msgAnnotated doesn't exist for it, change to cs all those parameters need to check in ChangeLogSet or inherited class
jenkinsci · Apr 1, 2012 · 4c16db3 · 4c16db3
1 parent 0284be4
commit 4c16db3
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/resources/hudson/plugins/emailext/templates/groovy-html.template b/src/main/resources/hudson/plugins/emailext/templates/groovy-html.template
@@ -33,12 +33,12 @@ if(changeSet != null) {
 	<TABLE width="100%">
     <TR><TD class="bg1" colspan="2"><B>CHANGES</B></TD></TR>
 <% 	changeSet.each() { cs ->
-		hadChanges = true
-		def aUser = cs.hudsonUser %>		
+		hadChanges = true %>		
       <TR>
-        <TD colspan="2" class="bg2">${spc}Revision <B><%= cs.metaClass.hasProperty('commitId') ? cs.commitId : cs.metaClass.hasProperty('revision') ? cs.revision : cs.changeNumber%></B> by
-          <B><%= aUser != null ? aUser.displayName : it.author.displayName%>: </B>
-          <B>(${it.msgAnnotated})</B>
+        <TD colspan="2" class="bg2">${spc}Revision <B><%= cs.metaClass.hasProperty('commitId') ? cs.commitId : cs.metaClass.hasProperty('revision') ? cs.revision : 
+        cs.metaClass.hasProperty('changeNumber') ? cs.changeNumber : "" %></B> by
+          <B><%= cs.author %>: </B>
+          <B>(${cs.msgAnnotated})</B>
          </TD>
       </TR>
 <%		cs.affectedFiles.each() { p -> %>