From 3db545859ba7a07893498a09883efd7db2e9cbe1 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Fri, 6 Feb 2009 21:49:08 +0000 Subject: [PATCH] Fixed a JavaScript bug in slave configuration page when locale is French. (report) git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@15084 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/slaves/DumbSlave.java | 10 +++++++++- .../resources/hudson/model/Computer/configure.jelly | 5 ++++- .../hudson/slaves/DumbSlave/configure-entries.jelly | 3 +-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/slaves/DumbSlave.java b/core/src/main/java/hudson/slaves/DumbSlave.java index 2464888e69..d1d0ad2b6f 100644 --- a/core/src/main/java/hudson/slaves/DumbSlave.java +++ b/core/src/main/java/hudson/slaves/DumbSlave.java @@ -23,10 +23,14 @@ */ package hudson.slaves; -import hudson.model.Slave; import hudson.model.Descriptor.FormException; +import hudson.model.Slave; +import hudson.util.FormFieldValidator.NonNegativeInteger; import org.kohsuke.stapler.DataBoundConstructor; +import javax.servlet.ServletException; +import java.io.IOException; + /** * Default {@link Slave} implementation for computers that do not belong to a higher level structure, * like grid or cloud. @@ -49,6 +53,10 @@ public final class DumbSlave extends Slave { public String getDisplayName() { return Messages.DumbSlave_displayName(); } + + public void doCheckNumExecutors() throws IOException, ServletException { + new NonNegativeInteger().process(); + } } static { diff --git a/core/src/main/resources/hudson/model/Computer/configure.jelly b/core/src/main/resources/hudson/model/Computer/configure.jelly index 5b406e9b82..5d76c3139f 100644 --- a/core/src/main/resources/hudson/model/Computer/configure.jelly +++ b/core/src/main/resources/hudson/model/Computer/configure.jelly @@ -36,8 +36,11 @@ THE SOFTWARE. checkUrl="'${rootURL}/fieldCheck?errorText='+escape('${%Name is mandatory}')+'&value='+escape(this.value)"/> + + + - + diff --git a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly index 79d2d3d50e..b89b79821d 100644 --- a/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly +++ b/core/src/main/resources/hudson/slaves/DumbSlave/configure-entries.jelly @@ -33,8 +33,7 @@ THE SOFTWARE. - +