From 34bb1a889f9296ea36c893d04b75f196a2c44273 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 16 Mar 2017 10:03:16 +0100 Subject: [PATCH] altre modifiche x invio email interno... --- XPST/Properties/PublishProfiles/EQUA.pubxml | 17 +++++++++-------- XPST/Properties/PublishProfiles/IIS02.pubxml | 19 ++++++++++++------- .../PublishProfiles/IIS02.pubxml.user | 2 +- XPST/Web.EQUA.config | 1 + XPST/Web.config | 1 + XPST/WebUserControls/mod_btnComandi.ascx.cs | 2 +- 6 files changed, 25 insertions(+), 17 deletions(-) diff --git a/XPST/Properties/PublishProfiles/EQUA.pubxml b/XPST/Properties/PublishProfiles/EQUA.pubxml index d3cf684..9dd8e7e 100644 --- a/XPST/Properties/PublishProfiles/EQUA.pubxml +++ b/XPST/Properties/PublishProfiles/EQUA.pubxml @@ -9,10 +9,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt Release Any CPU - True - True - False - DonotMerge True C:\Users\samuele.STEAMWAREWIN\Documents\Visual Studio 2010\Projects\XPS\project\Release Clienti\XPST.zip true @@ -22,21 +18,21 @@ by editing this MSBuild file. In order to learn more about this please visit htt - + - + - + - + @@ -51,6 +47,11 @@ by editing this MSBuild file. In order to learn more about this please visit htt + True + True + True + False + DonotMerge diff --git a/XPST/Properties/PublishProfiles/IIS02.pubxml b/XPST/Properties/PublishProfiles/IIS02.pubxml index 4bd0952..40d650b 100644 --- a/XPST/Properties/PublishProfiles/IIS02.pubxml +++ b/XPST/Properties/PublishProfiles/IIS02.pubxml @@ -16,28 +16,28 @@ by editing this MSBuild file. In order to learn more about this please visit htt False WMSVC True - steamwarewin\administrator + jenkins <_SavePWD>True - + - + - + - + @@ -53,14 +53,19 @@ by editing this MSBuild file. In order to learn more about this please visit htt True + False True True False DonotMerge - - + + False + + + False + \ No newline at end of file diff --git a/XPST/Properties/PublishProfiles/IIS02.pubxml.user b/XPST/Properties/PublishProfiles/IIS02.pubxml.user index dd0bbf0..6b40d84 100644 --- a/XPST/Properties/PublishProfiles/IIS02.pubxml.user +++ b/XPST/Properties/PublishProfiles/IIS02.pubxml.user @@ -6,6 +6,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt 2012-12-21T10:14:32.4948710+01:00 - AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAA/bYFd3Gxq0iucbk2ZdN5XwAAAAACAAAAAAADZgAAwAAAABAAAAC/t9Ar6cUWKrivkr9iSVWcAAAAAASAAACgAAAAEAAAADJL/FO/2u+COpTP41fYxTsYAAAA3K+gj2M8Xq2g/ifwl9FPkzTnUTCfyvS8FAAAADGl+pr+jflOweZxTAAej3xlMbA4 + AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAgepbcUjBsk6qZB2yYjIK1QAAAAACAAAAAAADZgAAwAAAABAAAABN4RwDSavo32/Gtfqf9jCLAAAAAASAAACgAAAAEAAAAIcgS3Q/xtyYdikT3SZWw5IYAAAAH5FIDK3h0USKi0yl3F4EBsBxBR1LVfRoFAAAAMaGv7QzR8tVIJRhQum7VWIUZJDV \ No newline at end of file diff --git a/XPST/Web.EQUA.config b/XPST/Web.EQUA.config index 1ebd7c3..e678fe7 100644 --- a/XPST/Web.EQUA.config +++ b/XPST/Web.EQUA.config @@ -17,6 +17,7 @@ + diff --git a/XPST/Web.config b/XPST/Web.config index d5a6699..6494e35 100644 --- a/XPST/Web.config +++ b/XPST/Web.config @@ -120,6 +120,7 @@ + diff --git a/XPST/WebUserControls/mod_btnComandi.ascx.cs b/XPST/WebUserControls/mod_btnComandi.ascx.cs index cade319..0c113c3 100644 --- a/XPST/WebUserControls/mod_btnComandi.ascx.cs +++ b/XPST/WebUserControls/mod_btnComandi.ascx.cs @@ -275,7 +275,7 @@ namespace XPST.WebUserControls { DS_applicazione.v_commesseRow rigaComm= XPS.obj.taComm.getByCod(comando.valore)[0]; subject += string.Format(" | cliente: {0}", rigaComm.Cliente); - bodyMsg += string.Format("

Link diretto al DDT {2} - {3}", memLayer.ML.CRS("currSite"), rigaComm.Cod, rigaComm.DDT, rigaComm.descrizione); + bodyMsg += string.Format("

Link diretto al DDT {2} - {3}", memLayer.ML.CRS("mainSite"), rigaComm.Cod, rigaComm.DDT, rigaComm.descrizione); } // invio email! bool fatto = gestEmail.geAuth.mandaEmail(memLayer.ML.confReadString("_emailUser"), emailDest, subject, bodyMsg);