Inizio fix gestione CONFIG su LAND

This commit is contained in:
Samuele E. Locatelli
2018-10-19 11:58:49 +02:00
parent 1d8c157820
commit 9f9d31ebdc
2 changed files with 6 additions and 5 deletions
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=869']) {
withEnv(['NEXT_BUILD_NUMBER=870']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
+5 -4
View File
@@ -18,10 +18,11 @@
<div id="navbarContent" class="navbar-collapse collapse">
<ul class="navbar-nav mr-auto">
@*<li>@Html.ActionLink("Home", "Index", "Home")</li>*@
<li class="nav-item">@Html.ActionLink("User List", "UserListQR", "Home", new { @class = "nav-link" })</li>
<li class="nav-item">@Html.ActionLink("About", "About", "Home", new { @class = "nav-link" })</li>
<li class="nav-item">@Html.ActionLink("Contact", "Contact", "Home", new { @class = "nav-link" })</li>
<li class="nav-item">@Html.ActionLink("Package Versions", "Packages", "Home", new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-info btn-sm mx-1">@Html.ActionLink("User List", "UserListQR", "Home", new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-info btn-sm mx-1">@Html.ActionLink("Package Versions", "Packages", "Home", new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-info btn-sm mx-1">@Html.ActionLink("Config man", "ConfigMan", "Home", new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-secondary btn-sm mx-1">@Html.ActionLink("About", "About", "Home", new { @class = "nav-link" })</li>
<li class="nav-item btn btn-outline-secondary btn-sm mx-1">@Html.ActionLink("Contact", "Contact", "Home", new { @class = "nav-link" })</li>
</ul>
</div>
</div>