Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix JENKINS-20013
Added an Always trigger that is setup in the plugin by default. This
trigger will ALWAYS trigger an email to recipients, requestor and
culprits.
  • Loading branch information
slide committed Oct 23, 2013
1 parent d288c1e commit 227d9b0
Showing 1 changed file with 5 additions and 2 deletions.
@@ -1,4 +1,5 @@
import hudson.plugins.emailext.plugins.EmailTrigger
import hudson.plugins.emailext.plugins.trigger.AlwaysTrigger

// Namespaces
l = namespace("/lib/layout")
Expand All @@ -9,7 +10,7 @@ f = namespace("/lib/form")
d = namespace("jelly:define")


def triggers = hudson.plugins.emailext.plugins.EmailTrigger.all()
def triggers = EmailTrigger.all()
def configured = instance != null

f.entry(title: _("Project Recipient List"), help: "/plugin/email-ext/help/projectConfig/globalRecipientList.html", description: _("Comma-separated list of email address that should receive notifications for this project.")) {
Expand Down Expand Up @@ -60,8 +61,10 @@ f.advanced(title: _("Advanced Settings")) {
f.entry(title: _("Save to Workspace"), help: "/plugin/email-ext/help/projectConfig/saveOutput.html") {
f.checkbox(name: "project_save_output", checked: instance?.saveOutput)
}

def configuredTriggers = instance != null ? instance.configuredTriggers : [AlwaysTrigger.createDefault()]

f.entry(title: _("Triggers"), help: "/plugin/email-ext/help/projectConfig/triggers.html") {
f.hetero_list(name: "project_triggers", hasHeader: true, descriptors: triggers, items: instance?.configuredTriggers, addCaption:_("Add Trigger"), deleteCaption: _("Remove Trigger"))
f.hetero_list(name: "project_triggers", hasHeader: true, descriptors: triggers, items: configuredTriggers, addCaption:_("Add Trigger"), deleteCaption: _("Remove Trigger"))
}
}

0 comments on commit 227d9b0

Please sign in to comment.