Skip to content
Permalink
Browse files
[FIXED JENKINS-42194] Do not display a warning when ignoring post-com…
…mit hooks
  • Loading branch information
stephenc committed Feb 20, 2017
1 parent 0e67ad4 commit d0d9216f4fba8337f853aadf9853fb8dcc5cb1cf
@@ -72,10 +72,12 @@
import net.sf.json.JSONObject;
import org.apache.commons.io.FileUtils;
import org.apache.commons.jelly.XMLOutput;
import org.apache.commons.lang.StringUtils;
import org.jenkinsci.Symbol;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.DoNotUse;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;
import org.kohsuke.stapler.QueryParameter;
@@ -358,6 +360,20 @@ public FormValidation doCheckPollingThreadCount(@QueryParameter String value) {
return FormValidation.ok();
return FormValidation.validateNonNegativeInteger(value);
}

/**
* Performs syntax check.
*/
public FormValidation doCheckScmpoll_spec(@QueryParameter String value,
@QueryParameter boolean ignorePostCommitHooks,
@AncestorInPath Item item) {
if (ignorePostCommitHooks && StringUtils.isBlank(value)) {
return FormValidation.ok(Messages.SCMTrigger_no_schedules_no_hooks());
} else {
return Jenkins.getInstance().getDescriptorByType(TimerTrigger.DescriptorImpl.class)
.doCheckSpec(value, item);
}
}
}

@Extension
@@ -23,6 +23,7 @@
SCMTrigger.DisplayName=Poll SCM
SCMTrigger.getDisplayName={0} Polling Log
SCMTrigger.BuildAction.DisplayName=Polling Log
SCMTrigger.no_schedules_no_hooks=Post commit hooks are being ignored and no schedules so will never run
SCMTrigger.SCMTriggerCause.ShortDescription=Started by an SCM change
TimerTrigger.DisplayName=Build periodically
TimerTrigger.MissingWhitespace=You appear to be missing whitespace between * and *.
@@ -25,7 +25,7 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<f:entry title="${%Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec">
<f:textarea field="scmpoll_spec" checkUrl="'descriptorByName/hudson.triggers.TimerTrigger/checkSpec?value='+encodeURIComponent(this.value)"/>
<f:textarea field="scmpoll_spec"/>
</f:entry>
<f:entry field="ignorePostCommitHooks" title="${%Ignore post-commit hooks}">
<f:checkbox />

0 comments on commit d0d9216

Please sign in to comment.