提交 d0d9216f 编写于 作者: S Stephen Connolly

[FIXED JENKINS-42194] Do not display a warning when ignoring post-commit hooks

上级 0e67ad4e
......@@ -72,10 +72,12 @@ import jenkins.util.SystemProperties;
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 class SCMTrigger extends Trigger<Item> {
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 />
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册