diff --git a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java index 427e3a0c7..378e07b7e 100644 --- a/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java +++ b/src/main/java/hudson/plugins/emailext/ExtendedEmailPublisher.java @@ -206,8 +206,8 @@ public ExtendedEmailPublisher(String project_recipient_list, String project_cont } @DataBoundSetter - public void setPostsendScript(String project_postsend_script) { - this.postsendScript = project_postsend_script; + public void setPostsendScript(String postsendScript) { + this.postsendScript = postsendScript; } /** diff --git a/src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/config.groovy b/src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/config.groovy index 09f95261b..710cc954e 100644 --- a/src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/config.groovy +++ b/src/main/resources/hudson/plugins/emailext/ExtendedEmailPublisher/config.groovy @@ -60,7 +60,7 @@ f.advanced(title: _("Advanced Settings")) { f.textarea(id: "project_presend_script", name: "project_presend_script", value: configured ? instance.presendScript : "\$DEFAULT_PRESEND_SCRIPT", class: "setting-input") } f.entry(title: _("Post-send Script"), help: "/plugin/email-ext/help/projectConfig/postsendScript.html") { - f.textarea(id: "project_postsend_script", name: "project_postsend_script", value: configured ? instance.postsendScript : "\$DEFAULT_POSTSEND_SCRIPT", class: "setting-input") + f.textarea(id: "postsendScript", name: "postsendScript", value: configured ? instance.postsendScript : "\$DEFAULT_POSTSEND_SCRIPT", class: "setting-input") } f.entry(title: _("Additional groovy classpath"), help: "/plugin/help/projectConfig/defaultClasspath.html") { f.repeatable(field: "classpath") { @@ -89,4 +89,4 @@ f.advanced(title: _("Advanced Settings")) { f.entry(title: _("Triggers"), help: "/plugin/email-ext/help/projectConfig/addATrigger.html") { f.hetero_list(name: "project_triggers", hasHeader: true, descriptors: triggers, items: configuredTriggers, addCaption:_("Add Trigger"), deleteCaption: _("Remove Trigger"), capture: "showSendTo") } -} \ No newline at end of file +} diff --git a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java index 56450aaa4..f16b455ec 100644 --- a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java +++ b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java @@ -998,7 +998,7 @@ public Void call() throws Exception { form.put("project_default_content", "Give me a $1000 check and I'll mail you back $5000!!!"); form.put("project_attachments", ""); form.put("project_presend_script", ""); - form.put("project_postsend_script", ""); + form.put("postsendScript", "println 1"); form.put("project_replyto", ""); ExtendedEmailPublisherDescriptor descriptor = new ExtendedEmailPublisherDescriptor(); @@ -1010,6 +1010,7 @@ public Void call() throws Exception { assertEquals("Give me a $1000 check and I'll mail you back $5000!!!", publisher.defaultContent); assertEquals("", publisher.attachmentsPattern); assertEquals("", publisher.replyTo); + assertEquals("println 1", publisher.postsendScript); return null; }