Improved highlighting and help messages for the triggers.

Signed-off-by: Winston Prakash <winston.prakash@gmail.com>

7 files changed, 31 insertions, 15 deletions

diff --git a/hudson-core/src/main/java/hudson/model/AbstractProject.java b/hudson-core/src/main/java/hudson/model/AbstractProject.java
index 76d3edd..c728489 100644
--- a/hudson-core/src/main/java/hudson/model/AbstractProject.java
+++ b/hudson-core/src/main/java/hudson/model/AbstractProject.java
@@ -912,6 +912,7 @@ public abstract class AbstractProject<P extends AbstractProject<P,R>,R extends A
                     pl.replace(new BuildTrigger(newChildProjects,
                         existing==null?Result.SUCCESS:existing.getThreshold()));
                 }
+                p.putAllProjectProperties(DescribableListUtil.convertToProjectProperties(pl, p), false);
             }
         }
 
diff --git a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
index d30b1db..21e2505 100644
--- a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
+++ b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/config.jelly
@@ -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,14 +9,17 @@
 #
 # Contributors: 
 #
-#    Kohsuke Kawaguchi
+#    Kohsuke Kawaguchi, Anton Kozak
 #        
 #
 #************************************************************************** --> 
 
 
 <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">
-  <f:entry title="${%Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec">
+  <j:set var="instanceProperty" value="${cu.getExternalProjectProperty(it, descriptor.jsonSafeClassName)}"/>
+  <j:set var="instance" value="${instanceProperty.getValue()}"/>
+
+  <f:entry title="${%Schedule}" help="/descriptor/hudson.triggers.TimerTrigger/help/spec" isPropertyOverridden="${instanceProperty.isOverridden()}">
     <f:textarea name="scmpoll_spec" checkUrl="'${rootURL}/trigger/TimerTrigger/check?value='+encodeURIComponent(this.value)" value="${instance.spec}"/>
   </f:entry>
 </j:jelly>
diff --git a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help.html b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help.html
index 1438f7f..ff9b480 100644
--- a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help.html
+++ b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help.html
@@ -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
@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#         Kohsuke Kawaguchi
+#         Kohsuke Kawaguchi, Anton Kozak
 #
 #************************************************************************** -->
 
@@ -20,4 +20,7 @@
   requires Hudson to scan the entire workspace and verify it with the server.
   Consider setting up a "push" trigger to avoid this overhead, as described in
   <a href="https://hudson.java.net/build.html">this document</a>
+  <p>
+  It's possible to use Project cascading feature for this property. Please review <a href="http://wiki.hudson-ci.org/display/HUDSON/Project+cascading">
+  this document</a>.
 </div>
diff --git a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help_ru.html b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help_ru.html
index f5cdcb5..8191df8 100644
--- a/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help_ru.html
+++ b/hudson-core/src/main/resources/hudson/triggers/SCMTrigger/help_ru.html
@@ -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
@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#         Kohsuke Kawaguchi
+#         Kohsuke Kawaguchi, Anton Kozak
 #
 #************************************************************************** -->
 
@@ -21,4 +21,7 @@
   сверка содержимого с данными на сервере. Лучшим вариантом будет настройка 
   вашей SCM на инициацию сборки при внесении в неё изменений, как описано
   <a href="https://hudson.java.net/build.html">в этом документе</a>.
+ <p>
+ Для этого свойства возможно использовать Проектное каскадирование. Детали доступны в <a href="http://wiki.hudson-ci.org/display/HUDSON/Project+cascading">
+ этом документе</a>.
 </div>
diff --git a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly
index 8d5eca0..bf18886 100644
--- a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly
+++ b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/config.jelly
@@ -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,14 +9,16 @@
 #
 # Contributors: 
 #
-#    Kohsuke Kawaguchi, InfraDNA, Inc.
+#    Kohsuke Kawaguchi, InfraDNA, Inc., Anton Kozak
 #        
 #
 #************************************************************************** --> 
 
 
 <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">
-  <f:entry title="${%Schedule}" field="spec">
+  <j:set var="instanceProperty" value="${cu.getExternalProjectProperty(it, descriptor.jsonSafeClassName)}"/>
+  <j:set var="instance" value="${instanceProperty.getValue()}"/>
+  <f:entry title="${%Schedule}" field="spec" isPropertyOverridden="${instanceProperty.isOverridden()}">
     <f:textarea />
   </f:entry>
 </j:jelly>
diff --git a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help.html b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help.html
index d689dbc..8b11f42 100644
--- a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help.html
+++ b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help.html
@@ -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
@@ -8,7 +8,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#         Kohsuke Kawaguchi
+#         Kohsuke Kawaguchi, Anton Kozak
 #
 #************************************************************************** -->
 
@@ -29,5 +29,7 @@
 
   <p>
   So, before using this feature, stop and ask yourself if this is really what you want.
-
+  <p>
+  It's possible to use Project cascading feature for this property. Please review <a href="http://wiki.hudson-ci.org/display/HUDSON/Project+cascading">
+  this document</a>.
 </div>
diff --git a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help_ru.html b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help_ru.html
index 73725e3..4164c5b 100644
--- a/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help_ru.html
+++ b/hudson-core/src/main/resources/hudson/triggers/TimerTrigger/help_ru.html
@@ -26,6 +26,8 @@
   Для этого Вам необходимо <a href="https://hudson.java.net/build.html">подключить SCM информирование об изменениях к Hudson.</a>.
 
   <p>
-  Таким образом, перед использованием этой функции, остановитесь и спросите себя действительно ли эта функция именно то что Вам действительно необходимо.
-
+  Таким образом, перед использованием этой функции, остановитесь и спросите себя действительно ли эта функция именно то что Вам необходимо.
+  <p>
+  Для этого свойства возможно использовать Проектное каскадирование. Детали доступны в <a href="http://wiki.hudson-ci.org/display/HUDSON/Project+cascading">
+  этом документе</a>.
 </div>