Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v 1037 fix x ADM

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-12-07 19:20:27 +01:00
parent 768c3679b7
commit e04f70ff92
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+3 -3
View File
@@ -18,9 +18,9 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1036']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
withEnv(['NEXT_BUILD_NUMBER=1037']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.3.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
}
}
MP-ADM/GestKIT.aspx
+1 -1
View File
@@ -7,7 +7,7 @@
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<asp:Label runat="server" ID="lblDataImportOut" CssClass="text-danger" />
<div runat="server" id="divContent">
<uc1:mod_gestKIT runat="server" ID="mod_gestKIT" />
<uc1:mod_gestKIT runat="server" ID="mod_gestKIT" Visible="false" />
<hr />
<uc1:mod_barcode runat="server" ID="mod_barcode" />
<hr />
MP-ADM/WebUserControls/mod_gestKIT.ascx.cs
+2 -1
View File
@@ -127,7 +127,8 @@ namespace MP_ADM.WebUserControls
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
bool OptAdmKitEnabled = memLayer.ML.CRB("OptAdmKitEnabled");
if (!Page.IsPostBack && OptAdmKitEnabled)
{
doReset();
}