From 03477e86fbb0ea2565f7e706ac653fcd71cdc554 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 14 Aug 2018 07:42:53 +0200 Subject: [PATCH] fix presel condominio --> add New intervento --- Jenkinsfile | 2 +- PUB/WebUserContols/mod_ER_all.ascx.cs | 2 +- PUB/WebUserContols/mod_ER_selCondominio.ascx.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eef63b3..f5b491e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=193']) { + withEnv(['NEXT_BUILD_NUMBER=194']) { // env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'SOSCONDOMINI' diff --git a/PUB/WebUserContols/mod_ER_all.ascx.cs b/PUB/WebUserContols/mod_ER_all.ascx.cs index beec2b2..fb6a991 100644 --- a/PUB/WebUserContols/mod_ER_all.ascx.cs +++ b/PUB/WebUserContols/mod_ER_all.ascx.cs @@ -53,7 +53,7 @@ namespace PUB.WebUserContols private void saveSelections() { - divAddNew.Visible = (mod_ER_selCondominio.condSelected != "0" && currMode == ER_EditMode.mPAM); + divAddNew.Visible = (mod_ER_selCondominio.condSelected != "0" && mod_ER_selCondominio.condSelected != "" && currMode == ER_EditMode.mPAM); mod_ER_grid.idxCond = mod_ER_selCondominio.condSelected; mod_ER_insNew.idxCond = mod_ER_selCondominio.condSelected; } diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs index 119bb8d..2133d44 100644 --- a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs +++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs @@ -143,7 +143,7 @@ namespace PUB.WebUserContols protected void ddlGruppo_SelectedIndexChanged(object sender, EventArgs e) { currGroup = ddlGruppo.SelectedValue; - + saveSelections(); } } } \ No newline at end of file