From 1f8918c292df04bc282a6e27f1ddfd8069ed8b98 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 9 Feb 2017 15:47:22 +0100 Subject: [PATCH] Fix errore post udpate dett intervento x allegati forza il reload pagina --- GIM_dataLayer/bin/Release/GIM_dataLayer.dll | Bin 688640 -> 688640 bytes GIM_dataLayer/bin/Release/SteamWare.dll | Bin 802304 -> 802304 bytes ...Layer.csprojResolveAssemblyReference.cache | Bin 49918 -> 49928 bytes GIM_dataLayer/obj/Release/GIM_dataLayer.dll | Bin 688640 -> 688640 bytes .../WebUserControls/mod_dettInt_default.ascx | 2 +- .../mod_dettaglioIntervento.ascx.cs | 42 ++++++++++-------- GIM_site/bin/SteamWare.dll | Bin 802304 -> 802304 bytes 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/GIM_dataLayer/bin/Release/GIM_dataLayer.dll b/GIM_dataLayer/bin/Release/GIM_dataLayer.dll index 50fc02f58842881fedae44f5952dd02a0b439fdf..a95cd746a357f3da05fdc7886f161a36103cbf41 100644 GIT binary patch delta 120 zcmZo@(Q0VXn$W?_TQjGzyS1CKwVSE6o4K`{rL~*2wVSQAo4vK0qqUoJYd6|0b_t%V{C&dD W-33l-{`0QBCv@@6cAiSEFB|~0RxS~N@8|ncWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{76d)^4t~)&jFT z_P^CpZ17&^ICIm{M}^b2d)RQzu+af(j$i-+CLoq!WMKF)jf>$&1s6k5uuJgSmB};8 W?t1#oTDZxcaeCZ~?L3uSUpN2)S}pwm diff --git a/GIM_dataLayer/bin/Release/SteamWare.dll b/GIM_dataLayer/bin/Release/SteamWare.dll index 6f69dad32c2cbdb1c0a82e54265fd1dbb8c16a8b..2e4fc8c7f1bb660a8405a0ab5ee57ca80fd31bd2 100644 GIT binary patch delta 71 zcmV-N0J#5v{4jw0Fp!7>I4yySg^B@%iUNg-1BHqNg^C4*iUx&>2Zf3Vg^CGO%{QQg^B@%iUNg-1BHqNg^C4*iUx&>2Zf3Vg^CG62L6o%(c`_1@$(}iivSQfiXrM3edrtJX1MA1y4h0;Z|1xuG1IxNLbp+ZI= zXzdS>0wUy)poj<(RFo9RL|hUc^!7hDoC@rNdWAPGc4@VvJ@EDblgr{_NJd+)jP z-IMgjx}**3lMeSOQcj2XxXz1{n5@&hefB7x|EBiB}a`E zo6WXZ8~?PYs8mWd`cxY2Fm@X0thBQdHnC>}uVS><3X|nbQ*PSq>@+f%^^)6IMO#ZO zyCai&?^|VLF^sbD5vnshnavA2x|%Cz*0e<uQ{j)o|x;66fmbkvd zp;Uu9`rQtV@26U;R%O#0){Dj{wsf(jfi^it8>4v@<5df-ak|wQ+U)99W9fz~t{&ji zV~Le1tx0yHh}6i-bZ&&1A7Z~*fiRteV+IE+Ugi(@Ck3XIO|gt(cCMq>-Ib45!c+y* z%wZL0e#^WvYS*#uquEZb{xob&2=n1>ri)oSanByPXW_E#?Oxoo1*TSnHaNo^ z?!0G&*DAna_!n7lx6x9i_b{~&Ga0H3Z&hrYx^hLs`hhAl$_8^G!Xgfi#mM5N{!)Li zysXSJ%Hi&Ldv$#9S1p0ufv^1=FC+!RF@mK&;}SrJ$;?q zrK;)Cyn<}Jylz_J#Nugg=ir<}tMh8}(F_<0FRxv%a-vgg-5HybacPd&zo zKJ_>!&V~GoD|~n~4274`t`nSS*XNu#@m9LF9kpFw@XGv>gL`SBzu-i&3eoZ+PqyCp z4P(7=09)2@2+{5$Pm3166Y+b9Ya#M9e-L~I_<6xU3jPWB1;IZH{sp)PnB2uf<$o3N zEJVCyC^4-#Sq;`dC+c~q>!I>AF9`k%_$9#?1z!T*Aoy>=mx23$X^(HH{uL3gLfoXq zlRnQ3UFTmBuR(knB2V+W;QxTP2)-fsCh#l33E%idiof=@2}9-5xFPh{PUl4J(4ONH zO5wRwGUUk-PcA&W;GtZ!CwM&Y zTY@JH;uM=%0=^HNKJyRVHXxfyA@0}W1;1yazE)7gNf6(W6DJFv0{kv;qI_bO8tljl zQKv&as84JQ40U9ch%+Jf%ZalDR|6jsJX>%L@L|EVg6n{f=n4aY^F2+x#84k_&_7_l zIGf=-D!4^(EAWSc+XRP!KN1`fya4!P!R>;hz@Om%Sco1g`$vTm50{TaON4_SUOX2( z)s>=fx0Ae8CC^W6+i_M=@&1UtNhLP#ue4io@#MBa?b8G8w^?M6SqG!=FF)97$KO-^ T4Y&8DFQMK=2NGwF6uSQhTeE?Q delta 2221 zcmZ9KYiv|i5XXDAy}P}4+ikbNQcCS(E7&gWvfC{sk|-oypg?J(d#7?J)j``*S9+tp%^TMAbOhVFx}0WGQc@=Wr9-;wv+4DKVI4HqI6{BTv!Fb5*Xdr|o{pQW1^YAHYV1Y>qaKGYeL+Y<9q` zX5(A~FCGqtgB6kTa?6+^!GU)-#)nVRiIAsYx{%S$X5`^jCCb`)_lR^ejqu@|LPvs>_dC=p2SoPhaQvs2X~_peP${ z(NBulvG_ChuyHM-jRm!Z=oE%Rk95@Q?C7XB*l{hRUki2y&^8Q(w&N$2?9em0~__{vG%w!8ZjD0q+p}hu~Yl{lIiEkf?uK#5)jQ*5X$I-z;6{PZ9ru zxCV{Fx66o&fx&;E94C0X`_WSa1pOTY>|ECjq}LxO5n&C7EU5 zhrsERU}Co+NeV-JM~gRtzR7x96(UZ7cvx1f6g(C9JzzUBd9)gSkx@}+LOrTiYzie_ zWVMKMARdzy=L((&d|Ysi;Q7EO1lJ0#13sxMTnJsK&C61^st+Y27Fp@v)~rsGlE+Mw*h}FxLwh#@>?ouPm4^zn}}8Tc(S45n;yIVP?f{F#(@|q q4fgK6R}^hI+~l~HWM4i!&w+pGksAH)JKCuKmyRvg|M1C+-hTm>SbYWn diff --git a/GIM_dataLayer/obj/Release/GIM_dataLayer.dll b/GIM_dataLayer/obj/Release/GIM_dataLayer.dll index 50fc02f58842881fedae44f5952dd02a0b439fdf..a95cd746a357f3da05fdc7886f161a36103cbf41 100644 GIT binary patch delta 120 zcmZo@(Q0VXn$W?_TQjGzyS1CKwVSE6o4K`{rL~*2wVSQAo4vK0qqUoJYd6|0b_t%V{C&dD W-33l-{`0QBCv@@6cAiSEFB|~0RxS~N@8|ncWXCeYd2GCH*;$@OKUf4Yd2eKH+yS0M{76d)^4t~)&jFT z_P^CpZ17&^ICIm{M}^b2d)RQzu+af(j$i-+CLoq!WMKF)jf>$&1s6k5uuJgSmB};8 W?t1#oTDZxcaeCZ~?L3uSUpN2)S}pwm 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 6f69dad32c2cbdb1c0a82e54265fd1dbb8c16a8b..2e4fc8c7f1bb660a8405a0ab5ee57ca80fd31bd2 100644 GIT binary patch delta 71 zcmV-N0J#5v{4jw0Fp!7>I4yySg^B@%iUNg-1BHqNg^C4*iUx&>2Zf3Vg^CGO%{QQg^B@%iUNg-1BHqNg^C4*iUx&>2Zf3Vg^CG