Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakozak2011-11-24 08:34:07 -0500
committerWinston Prakash2011-12-01 20:47:26 -0500
commit77bb9f3ff736edca879f76f4de3567b6ab7fcfc8 (patch)
tree58fc3fdc5b4e940189684afa5dc7ca92b5930be5 /hudson-core/src/main/resources/hudson
parentfe08dc8f9f9b61b179e8a78f642bd61924f1108f (diff)
downloadorg.eclipse.hudson.core-77bb9f3ff736edca879f76f4de3567b6ab7fcfc8.tar.gz
org.eclipse.hudson.core-77bb9f3ff736edca879f76f4de3567b6ab7fcfc8.tar.xz
org.eclipse.hudson.core-77bb9f3ff736edca879f76f4de3567b6ab7fcfc8.zip
Added cascading for "Restrict where this project can be run"
Signed-off-by: Winston Prakash <winston.prakash@gmail.com>
Diffstat (limited to 'hudson-core/src/main/resources/hudson')
-rw-r--r--hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly23
1 files changed, 15 insertions, 8 deletions
diff --git a/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly b/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
index 9b33868d..f93fa85c 100644
--- a/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
+++ b/hudson-core/src/main/resources/hudson/model/AbstractItem/configure-common.jelly
@@ -48,14 +48,19 @@
</j:if>
<!-- master/slave -->
+ <j:set var="nodeChooserProperty" value="${cu.getBaseProjectProperty(it, it.APPOINTED_NODE_PROPERTY_NAME)}"/>
+ <j:set var="isNodeOverridden" value="${nodeChooserProperty.isOverridden()}" />
<j:if test="${app.labels.size() gt 1 || app.clouds.size() gt 0 || (it.assignedLabel!=null and it.assignedLabel!=app.selfLabel)}">
- <f:optionalBlock name="hasSlaveAffinity" title="${%Restrict where this project can be run}"
+ <f:optionalBlock name="${it.APPOINTED_NODE_PROPERTY_NAME}" title="${%Restrict where this project can be run}"
checked="${it.assignedLabel!=null}"
+ isPropertyOverridden="${isNodeOverridden}"
+ resetUrl="${jobUrl}/resetProjectProperty?propertyName=${it.APPOINTED_NODE_PROPERTY_NAME}"
help="/help/project-config/slave.html">
- <f:radioBlock name="affinityChooser" value="basic" title="${%Node and label menu}"
- checked="${!it.advancedAffinityChooser and it.assignedLabel!=null}">
- <f:entry title="${%Node}">
- <select class="setting-input" name="slave">
+ <f:radioBlock name="${it.AFFINITY_CHO0SER_KEY}" value="${it.BASIC_KEY}" title="${%Node and label menu}"
+ checked="${!it.advancedAffinityChooser and it.assignedLabel!=null}"
+ isPropertyOverridden="${isNodeOverridden}">
+ <f:entry title="${%Node}" isPropertyOverridden="${isNodeOverridden}">
+ <select class="setting-input" name="${it.SLAVE_KEY}">
<j:forEach var="s" items="${app.labels}">
<j:if test="${s.isAssignable()}">
<f:option selected="${s==it.assignedLabel}" value="${s.name}">${s.name}
@@ -66,9 +71,11 @@
</select>
</f:entry>
</f:radioBlock>
- <f:radioBlock name="affinityChooser" value="advanced" title="${%Advanced Node and Label expressions}"
- checked="${it.advancedAffinityChooser and it.assignedLabel!=null}">
- <f:entry title="${%Label Expression}" field="assignedLabelString">
+ <f:radioBlock name="${it.AFFINITY_CHO0SER_KEY}" value="advanced" title="${%Advanced Node and Label expressions}"
+ checked="${it.advancedAffinityChooser and it.assignedLabel!=null}"
+ isPropertyOverridden="${isNodeOverridden}">
+ <f:entry title="${%Label Expression}" field="assignedLabelString"
+ isPropertyOverridden="${isNodeOverridden}">
<f:textbox/>
</f:entry>
</f:radioBlock>

Back to the top