Fix JENKINS-19190

Make the matrix trigger mode member public for data binding and fix the name of the field in the config.groovy to match.
jenkinsci · Aug 13, 2013 · 53cceab · 53cceab
1 parent 9cd723e
commit 53cceab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java
@@ -151,7 +151,10 @@ public class ExtendedEmailPublisher extends Notifier implements MatrixAggregatab
      */
     public boolean saveOutput = false;
 
-    private MatrixTriggerMode matrixTriggerMode;
+    /**
+     * How to trigger the email if the project is a matrix project.
+     */
+    public MatrixTriggerMode matrixTriggerMode;
 
     /**
      * Get the list of configured email triggers for this project.

diff --git a/src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/config.groovy b/src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/config.groovy
@@ -45,12 +45,13 @@ f.entry(title: _("Attach Build Log"), help: "/plugin/email-ext/help/projectConfi
 f.entry(title: _("Content Token Reference"), field: "tokens")
 
 if(descriptor.isMatrixProject(my)) {
-  f.entry(field: "project_matrix_trigger_mode", title: _("Trigger for matrix projects")) {
+  f.entry(field: "matrixTriggerMode", title: _("Trigger for matrix projects")) {
     f.enum { 
       raw(my.description)
     }
   }
 }
+
 f.advanced() {
   f.entry(title: _("Pre-send Script"), help: "/plugin/email-ext/help/projectConfig/presendScript.html") {
     f.textarea(id: "project_presend_script", name: "project_presend_script", value: configured ? instance.presendScript : "\$DEFAULT_PRESEND_SCRIPT", class: "setting-input")