Merge pull request #2262 from kuisathaverat/JENKINS-34146

[FIX JENKINS-34146] check if build is build able before to ask for parameters
jenkinsci · Apr 22, 2016 · f6e431b · f6e431b
2 parents ce9de5a + 37e7856
commit f6e431b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java b/core/src/main/java/jenkins/model/ParameterizedJobMixIn.java
@@ -177,6 +177,10 @@ public final void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParamet
             delay = new TimeDuration(asJob().getQuietPeriod());
         }
 
+        if (!asJob().isBuildable()) {
+            throw HttpResponses.error(SC_INTERNAL_SERVER_ERROR, new IOException(asJob().getFullName() + " is not buildable"));
+        }
+
         // if a build is parameterized, let that take over
         ParametersDefinitionProperty pp = asJob().getProperty(ParametersDefinitionProperty.class);
         if (pp != null && !req.getMethod().equals("POST")) {
@@ -192,9 +196,6 @@ public final void doBuild(StaplerRequest req, StaplerResponse rsp, @QueryParamet
             return;
         }
 
-        if (!asJob().isBuildable()) {
-            throw HttpResponses.error(SC_INTERNAL_SERVER_ERROR, new IOException(asJob().getFullName() + " is not buildable"));
-        }
 
         Queue.Item item = Jenkins.getInstance().getQueue().schedule2(asJob(), delay.getTime(), getBuildCause(asJob(), req)).getItem();
         if (item != null) {