| author | akozak | 2011-11-22 10:35:03 (EST) |
|---|---|---|
| committer | Winston Prakash | 2011-12-01 20:47:02 (EST) |
| commit | 831da551c48a79f1f7f1e1195f414c4a3af0c282 (patch) (side-by-side diff) | |
| tree | ada8965833ab56a27a88e017dd7907b7db0aecfd | |
| parent | 804e1cb8e7918ccac961d62dd7e289a61d48f1ce (diff) | |
| download | org.eclipse.hudson.core-831da551c48a79f1f7f1e1195f414c4a3af0c282.zip org.eclipse.hudson.core-831da551c48a79f1f7f1e1195f414c4a3af0c282.tar.gz org.eclipse.hudson.core-831da551c48a79f1f7f1e1195f414c4a3af0c282.tar.bz2 | |
Implement DropDown instead of textfield for cascading project
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
| -rw-r--r-- | hudson-core/src/main/resources/hudson/model/Job/configure.jelly | 21 | ||||
| -rw-r--r-- | hudson-core/src/main/resources/hudson/model/Job/configure.properties | 5 |
2 files changed, 19 insertions, 7 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly index 3e3c9d8..8774a47 100644 --- a/hudson-core/src/main/resources/hudson/model/Job/configure.jelly +++ b/hudson-core/src/main/resources/hudson/model/Job/configure.jelly @@ -1,6 +1,6 @@ <!-- ************************************************************************** # -# Copyright (c) 2004-2010 Oracle Corporation. +# Copyright (c) 2004-2011 Oracle Corporation. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 @@ -9,7 +9,7 @@ # # Contributors: # -# Kohsuke Kawaguchi, id:cactusman +# Kohsuke Kawaguchi, id:cactusman, Nikita Levyankov # # #************************************************************************** --> @@ -32,9 +32,20 @@ <f:textbox name="name" value="${it.name}" /> </f:entry> </j:if> - <f:entry title="${%templateName}"> - <f:textbox name="templateName" value="${it.templateName}" /> - </f:entry> + <j:set var="cascadingCandidates" value="${app.getAllItems(it.class)}"/> + <j:if test="${cascadingCandidates.size() gt 1}"> + <f:entry title="${%cascadingProjectName}"> + <select class="setting-input" name="cascadingProjectName"> + <f:option/> + <j:forEach var="job" items="${cascadingCandidates}"> + <j:if test="${job.name != it.name}"> + <f:option selected="${job.name==it.cascadingProjectName}" value="${job.name}">${job.name}</f:option> + </j:if> + </j:forEach> + </select> + <!--<f:textbox name="cascadingProjectName" value="${it.cascadingProjectName}"/>--> + </f:entry> + </j:if> <f:entry title="${%Description}" help="/help/project-config/description.html"> <f:textarea name="description" value="${it.description}"/> </f:entry> diff --git a/hudson-core/src/main/resources/hudson/model/Job/configure.properties b/hudson-core/src/main/resources/hudson/model/Job/configure.properties index 4eaad69..6ed175b 100644 --- a/hudson-core/src/main/resources/hudson/model/Job/configure.properties +++ b/hudson-core/src/main/resources/hudson/model/Job/configure.properties @@ -1,6 +1,6 @@ #************************************************************************** # -# Copyright (c) 2004-2009 Oracle Corporation +# Copyright (c) 2004-2011 Oracle Corporation # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 @@ -9,9 +9,10 @@ # # Contributors: # -# Kohsuke Kawaguchi, id:cactusman +# Kohsuke Kawaguchi, id:cactusman, Nikita Levyankov # # #************************************************************************** name={0} name +cascadingProjectName=Cascading Project |