Fix JENKINS-19585

Fixed issue with contentType stuff
jenkinsci · Sep 13, 2013 · 87d4e30 · 87d4e30
1 parent 23e5ab8
commit 87d4e30
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/resources/hudson/plugins/emailext/plugins/EmailTrigger/config.groovy b/src/main/resources/hudson/plugins/emailext/plugins/EmailTrigger/config.groovy
@@ -23,9 +23,9 @@ f.entry(title: _("Send To"), help:"help") {
     }
     f.entry(title: _("Content Type"), help: "/plugin/email-ext/help/projectConfig/contentType.html") {
       select(name: "contentType", class: "setting-input") {
-        f.option(selected: 'project'==instance?.email.contentType, value: "project", _("Project Content Type")) 
-        f.option(selected: 'text/plain'==instance?.email.contentType, value: "text/plain", _("projectContentType.plainText")) 
-        f.option(selected: 'text/html'==instance?.email.contentType, value: "text/html", _("projectContentType.html")) 
+        f.option(selected: 'project'== (instance != null ? instance.email.contentType : ""), value: "project", _("Project Content Type")) 
+        f.option(selected: 'text/plain'==(instance != null ? instance.email.contentType : ""), value: "text/plain", _("projectContentType.plainText")) 
+        f.option(selected: 'text/html'==(instance != null ? instance.email.contentType : ""), value: "text/html", _("projectContentType.html")) 
       }
     }
     f.entry(title: _("Subject"), help: "/plugin/email-ext/help/projectConfig/mailType/subject.html") {