diff --git a/Data/ActionUserControl.cs b/Data/ActionUserControl.cs index 552354f..076d60a 100644 --- a/Data/ActionUserControl.cs +++ b/Data/ActionUserControl.cs @@ -152,20 +152,28 @@ namespace Data private void saveDataSendEMail(string oggetto, string bodyTpl, string codAzione, int idxStato, bool doRedirect, bool notifyAmm, bool notifyB2BC, DS_app.ElencolRichRow riga) { + // hard coded: SE HO "HIDE" a fine azione --> privato (idxForn = 0) - es x le note RISERVATE + int idxForn = codAzione.EndsWith("HIDE") ? 0 : riga.idxFornitore; // compongo elementi email... string destinatario = ""; - try + if (idxForn > 0) { - destinatario = DtProxy.man.taAF.getByKey(riga.idxFornitore)[0].email; + try + { + destinatario = DtProxy.man.taAF.getByKey(idxForn)[0].email; + } + catch + { + destinatario = memLayer.ML.CRS("_adminEmail"); + } } - catch + else { destinatario = memLayer.ML.CRS("_adminEmail"); + oggetto = "RISERVATO - " + oggetto; } // compone corpo messaggio string corpo = string.Format(bodyTpl, riga.nom_cond, riga.genContatto, riga.telContatto, riga.messaggio); - // hard coded: SE HO "HIDE" a fine azione --> privato (idxForn = 0) - es x le note RISERVATE - int idxForn = codAzione.EndsWith("HIDE") ? 0 : riga.idxFornitore; // salvo azione DtProxy.man.taER_Acts.InsertQuery(riga.idxRichiesta, idxForn, DateTime.Now, codAzione, devicesAuthProxy.stObj.utente, corpo); // invio! diff --git a/Jenkinsfile b/Jenkinsfile index 9664292..cc727f4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=305']) { + withEnv(['NEXT_BUILD_NUMBER=307']) { // 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'