From e544f4dbd5e380fa237797119cd566abff8ceb85 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Mon, 19 May 2008 00:02:34 +0000 Subject: [PATCH] No need to show an option if there's only one choice. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9423 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Hudson.java | 4 +- .../model/Hudson/configureExecutors.jelly | 37 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 4a6f4ae95f..66ae0bbc8c 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -1534,7 +1534,9 @@ public final class Hudson extends View implements ItemGroup, Node, private > T newDescribedChild(StaplerRequest req, JSONObject j, String name, List> descriptors) throws FormException { - final String clazz = j.get(name + "Class").toString(); + + if(!j.has(name + "Class")) return null; + final String clazz = j.getString(name + "Class"); final JSONObject data = j.getJSONObject(name); j.remove(name + "Class"); j.remove(name); diff --git a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly b/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly index 80281b6b65..26ada546b3 100644 --- a/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly +++ b/core/src/main/resources/hudson/model/Hudson/configureExecutors.jelly @@ -81,23 +81,26 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + + + +