Fix display errore in import

This commit is contained in:
Samuele E. Locatelli
2020-08-10 14:08:08 +02:00
parent bb7be5b3ee
commit 8d8095ab2d
3 changed files with 3 additions and 6 deletions
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=314']) {
withEnv(['NEXT_BUILD_NUMBER=315']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
+1 -3
View File
@@ -16,9 +16,7 @@
<div class="col-6">
<div class="alert alert-primary">
<b>Last Action</b><br />
<asp:Label runat="server" ID="lblOutTask">
# <%: traduci("PositiveAction") %>
</asp:Label>
<asp:Label runat="server" ID="lblOutTask"></asp:Label>
</div>
</div>
<div class="col-3">
@@ -157,8 +157,7 @@ namespace NKC_WF.WebUserControls
protected void lbtDoAction_Click(object sender, EventArgs e)
{
// in base a cosa ho in memoria procedo con successivo step, qui FAKE...
//if (!imported)
// in base a cosa ho in memoria procedo con successivo step
if (checkOk && !imported)
{
tryImport(false);