Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-09-08 16:37:43 +02:00
parent fa3ff2568e 872e016964
commit 0bd2e74cfd
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=364']) {
withEnv(['NEXT_BUILD_NUMBER=365']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_BP_bunkList.ascx.cs
+8 -1
View File
@@ -85,6 +85,7 @@ namespace NKC_WF.WebUserControls
set
{
grView.SelectedIndex = value;
grView.DataBind();
}
}
/// <summary>
@@ -97,7 +98,13 @@ namespace NKC_WF.WebUserControls
int answ = 0;
try
{
int.TryParse(grView.SelectedValue.ToString(), out answ);
if (grView != null)
{
if (grView.SelectedValue != null)
{
int.TryParse(grView.SelectedValue.ToString(), out answ);
}
}
}
catch
{ }
NKC_WF/WebUserControls/cmp_BP_sheetList.ascx.cs
+8 -1
View File
@@ -37,6 +37,7 @@ namespace NKC_WF.WebUserControls
set
{
grView.SelectedIndex = value;
grView.DataBind();
}
}
/// <summary>
@@ -49,7 +50,13 @@ namespace NKC_WF.WebUserControls
int answ = 0;
try
{
int.TryParse(grView.SelectedValue.ToString(), out answ);
if (grView != null)
{
if (grView.SelectedValue != null)
{
int.TryParse(grView.SelectedValue.ToString(), out answ);
}
}
}
catch
{ }