diff --git a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll index 50fc02f..a95cd74 100644 Binary files a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll and b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll differ diff --git a/GIM_dataLayer/bin/Release/SteamWare.dll b/GIM_dataLayer/bin/Release/SteamWare.dll index 6f69dad..2e4fc8c 100644 Binary files a/GIM_dataLayer/bin/Release/SteamWare.dll and b/GIM_dataLayer/bin/Release/SteamWare.dll differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache index 6319b0f..86b38aa 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache and b/GIM_dataLayer/obj/Release/GIM_dataLayer.csprojResolveAssemblyReference.cache differ diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll index 50fc02f..a95cd74 100644 Binary files a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll and b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll differ diff --git a/GIM_site/WebUserControls/mod_dettInt_default.ascx b/GIM_site/WebUserControls/mod_dettInt_default.ascx index f918115..acbc01d 100644 --- a/GIM_site/WebUserControls/mod_dettInt_default.ascx +++ b/GIM_site/WebUserControls/mod_dettInt_default.ascx @@ -165,7 +165,7 @@
- +
diff --git a/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs b/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs index 1a853e9..a82661a 100644 --- a/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs +++ b/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx.cs @@ -38,22 +38,36 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl { refreshPostUpdate(); } + /// + /// URL corrente completo (pagina + parametri...) + /// + protected string currUrl + { + get + { + string answ = ""; + try + { + answ = string.Format("{0}?numIntMtz={1}", devicesAuthProxy.pagCorrente, memLayer.ML.QSI("numIntMtz")); + } + catch + { + answ = Request.Url.ToString(); + } + return answ; + } + } private void refreshPostUpdate() { - mod_dettInt_default.currMode = FormViewMode.ReadOnly; - mod_dettInt_default.Visible = true; - mod_dettInt_full.Visible = false; - mod_dettInt_default.doUpdate(); - btnCancel.Visible = false; + Response.Redirect(currUrl); } private void Mod_dettInt_default_eh_updated(object sender, EventArgs e) { - //refreshPostUpdate(); - Response.Redirect(devicesAuthProxy.pagCorrente); + Response.Redirect(currUrl); } - + /// /// setup iniziale e di reset dei controlli /// @@ -164,15 +178,7 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl /// protected void btnCancel_Click(object sender, EventArgs e) { - Response.Redirect(devicesAuthProxy.pagCorrente); -#if false - mod_dettInt_default.currMode = FormViewMode.ReadOnly; - mod_dettInt_default.Visible = true; - mod_dettInt_full.Visible = false; - btnCancel.Visible = false; - mod_dettInt_default.doUpdate(); - mod_dettInt_full.doUpdate(); -#endif + Response.Redirect(currUrl); } /// /// chiude la parte di editing @@ -186,5 +192,5 @@ public partial class mod_dettaglioIntervento : System.Web.UI.UserControl eh_chiudi(this, new EventArgs()); } } - + } diff --git a/GIM_site/bin/SteamWare.dll b/GIM_site/bin/SteamWare.dll index 6f69dad..2e4fc8c 100644 Binary files a/GIM_site/bin/SteamWare.dll and b/GIM_site/bin/SteamWare.dll differ