[JENKINS-34758] Parameters must be shown in the child build page

jenkinsci · May 23, 2016 · 55d2a6c · 55d2a6c
1 parent d3478a4
commit 55d2a6c
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 4 deletions.
diff --git a/src/main/java/hudson/matrix/MatrixChildParametersAction.java b/src/main/java/hudson/matrix/MatrixChildParametersAction.java
@@ -35,7 +35,6 @@
 import hudson.EnvVars;
 import hudson.Extension;
 import hudson.model.EnvironmentContributor;
-import hudson.model.InvisibleAction;
 import hudson.model.ParameterValue;
 import hudson.model.ParametersAction;
 import hudson.model.Run;
@@ -49,18 +48,29 @@
  * The class itself is public to be visible to core so it can pick up the {@link MatrixChildParametersActionEnvironmentContributor}.
  */
 @Restricted(NoExternalUse.class)
-public class MatrixChildParametersAction extends InvisibleAction implements MatrixChildAction {
+public class MatrixChildParametersAction extends ParametersAction implements MatrixChildAction {
 
     private final List<ParameterValue> parameters;
 
     MatrixChildParametersAction(List<ParameterValue> parameters) {
         this.parameters = parameters;
     }
 
-    List<ParameterValue> getParameters() {
+    @Override
+    public List<ParameterValue> getParameters() {
         return parameters;
     }
 
+    @Override
+    public ParameterValue getParameter(String name) {
+        for (ParameterValue p : parameters) {
+            if (p != null && p.getName().equals(name)) {
+                return p;
+            }
+        }
+        return null;
+    }
+
     static MatrixChildParametersAction create(ParametersAction action) {
         List<ParameterValue> p = new ArrayList<ParameterValue>();
         if (action != null) {

diff --git a/src/main/java/hudson/matrix/MatrixConfiguration.java b/src/main/java/hudson/matrix/MatrixConfiguration.java
@@ -479,10 +479,11 @@ public boolean scheduleBuild(List<? extends Action> actions, Cause c) {
 
         List<Action> allActions = new ArrayList<Action>();
         if(actions != null) {
-            allActions.addAll(actions);
             for (Action a : actions) { // SECURITY-170
                 if (a instanceof ParametersAction) {
                     allActions.add(MatrixChildParametersAction.create((ParametersAction) a));
+                } else {
+                    allActions.add(a);
                 }
             }
         }

diff --git a/src/main/resources/hudson/matrix/MatrixChildParametersAction/index.jelly b/src/main/resources/hudson/matrix/MatrixChildParametersAction/index.jelly
@@ -0,0 +1,54 @@
+<!--
+The MIT License
+
+Copyright (c) 2016 CloudBees, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+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"
+    xmlns:i="jelly:fmt" xmlns:p="/lib/hudson/project">
+  <l:layout title="${it.displayName}">
+    <j:invokeStatic var="currentThread" className="java.lang.Thread" method="currentThread" />
+    <j:invoke var="buildClass" on="${currentThread.contextClassLoader}" method="loadClass">
+      <j:arg value="hudson.model.Run"/>
+    </j:invoke>
+    <j:set var="build" value="${request.findAncestorObject(buildClass)}" />
+		<st:include page="sidepanel.jelly" it="${build}" />
+		<l:main-panel>
+			<h1>${%Build} ${build.displayName}</h1>
+			<div class="container-fluid pane-frame">
+				<div class="row">
+					<div class="col-xs-24 pane-header">${%Parameters}</div>
+					<div class="row col-xs-24 pane-content">
+						<table class="pane">
+							<j:forEach var="parameterValue" items="${it.parameters}">
+								<tbody>
+									<st:include it="${parameterValue}"
+									page="value.jelly" />
+								</tbody>
+							</j:forEach>
+						</table>
+					</div>
+				</div>
+			 </div>
+		</l:main-panel>
+  </l:layout>
+</j:jelly>