diff --git a/Jenkinsfile b/Jenkinsfile index e630675..49e0904 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=342']) { + withEnv(['NEXT_BUILD_NUMBER=343']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'B2BCONDOMINI' diff --git a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs index 226e643..72c86bb 100644 --- a/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs +++ b/PUB/WebUserContols/mod_ER_selCondominio.ascx.cs @@ -104,22 +104,16 @@ namespace PUB.WebUserContols } protected void lbtResetCond_Click(object sender, EventArgs e) { - Response.Redirect(titolo); -#if false - // preseleziono gruppo SE disponibile... - preselGroup(); - // fix condominio - fixSelCondomini(); -#endif -#if false // resetto gruppi.. - ddlGruppo.SelectedIndex = 0; + if (currMode != ER_EditMode.mPAZ) + { + ddlGruppo.SelectedIndex = 0; + } currGroup = ""; // sistemo il resto... ddlCondominio.DataBind(); ddlCondominio.SelectedIndex = 0; - saveSelections(); -#endif + saveSelections(); } public string condSelected