changeset 573:91b58ee782ac

TW-26913
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Tue, 26 Mar 2013 15:50:03 +0400
parents 6e5934c81b66
children 0b7e05418aa2
files mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Constants.java mercurial-server/resources/buildServerResources/mercurialSettings.jsp
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Constants.java	Wed Mar 20 13:26:31 2013 +0400
+++ b/mercurial-common/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Constants.java	Tue Mar 26 15:50:03 2013 +0400
@@ -29,4 +29,6 @@
   String UNCOMPRESSED_TRANSFER = "uncompressedTransfer";
   String USER_FOR_TAG = "tagUsername";
   String DETECT_SUBREPO_CHANGES = "detectSubrepoChanges";
+
+  String GLOBAL_DETECT_SUBREPO_CHANGES = "teamcity.hg.detectSubrepoChanges";
 }
--- a/mercurial-server/resources/buildServerResources/mercurialSettings.jsp	Wed Mar 20 13:26:31 2013 +0400
+++ b/mercurial-server/resources/buildServerResources/mercurialSettings.jsp	Tue Mar 26 15:50:03 2013 +0400
@@ -1,3 +1,5 @@
+<%@ page import="jetbrains.buildServer.serverSide.TeamCityProperties" %>
+<%@ page import="jetbrains.buildServer.buildTriggers.vcs.mercurial.Constants" %>
 <%@include file="/include.jsp"%>
 <%@ taglib prefix="props" tagdir="/WEB-INF/tags/props" %>
 <jsp:useBean id="propertiesBean" scope="request" type="jetbrains.buildServer.controllers.BasePropertiesBean"/>
@@ -8,6 +10,7 @@
   }
 }
 </script>
+<c:set var="subreposGloballyDisabled" value="<%= !TeamCityProperties.getBooleanOrTrue(Constants.GLOBAL_DETECT_SUBREPO_CHANGES) %>"/>
 <table class="runnerFormTable">
 
   <l:settingsGroup title="General Settings">
@@ -34,6 +37,9 @@
     <th><label for="detectSubrepoChanges">Detect subrepo changes: </label></th>
       <td>
         <props:checkboxProperty name="detectSubrepoChanges"/>
+        <c:if test="${subreposGloballyDisabled}">
+          <div class="smallNote" style="margin: 0;">Currently <b>disabled</b> for the entire server with 'teamcity.hg.detectSubrepoChanges' internal property.</div>
+        </c:if>
       </td>
     </tr>
   <tr>