From 34a24f1a65dced6e823a8338a1061b40a0a5601c Mon Sep 17 00:00:00 2001 From: Aaron Sadler Date: Mon, 19 Oct 2020 11:13:20 +0100 Subject: [PATCH 1/2] Fixed exception caused if form returns when invalid --- .../Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml | 2 +- .../Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ActiveIS.UmbracoForms.ConfirmInput/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml b/ActiveIS.UmbracoForms.ConfirmInput/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml index 1adb042..3abe158 100644 --- a/ActiveIS.UmbracoForms.ConfirmInput/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml +++ b/ActiveIS.UmbracoForms.ConfirmInput/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml @@ -24,7 +24,7 @@ @{if (Model.Mandatory) { data-val-required="@Model.RequiredErrorMessage" }} @{if (Model.Validate) { data-val-regex="@Model.InvalidErrorMessage" data-regex="@Html.Raw(Model.Regex)" }} /> - placeholder="Confirm @Model.PlaceholderText" }} data-val="true" data-val-validateconfirminput="@invalidMessage" diff --git a/TestSite/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml b/TestSite/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml index 1adb042..3abe158 100644 --- a/TestSite/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml +++ b/TestSite/Views/Partials/Forms/Themes/default/Fieldtypes/FieldType.ConfirmInput.cshtml @@ -24,7 +24,7 @@ @{if (Model.Mandatory) { data-val-required="@Model.RequiredErrorMessage" }} @{if (Model.Validate) { data-val-regex="@Model.InvalidErrorMessage" data-regex="@Html.Raw(Model.Regex)" }} /> - placeholder="Confirm @Model.PlaceholderText" }} data-val="true" data-val-validateconfirminput="@invalidMessage" From 6c410878be00f182797ea82159e95d946d5fc312 Mon Sep 17 00:00:00 2001 From: Aaron Sadler Date: Mon, 19 Oct 2020 11:23:07 +0100 Subject: [PATCH 2/2] Generated v1.0.1 --- .../ActiveIS.UmbracoForms.ConfirmInput_1.0.1.zip | Bin 0 -> 5449 bytes .../ActiveIS.UmbracoForms.ConfirmInput.nuspec | 2 +- .../App_Data/packages/createdPackages.config | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Builds/ActiveIS.UmbracoForms.ConfirmInput_1.0.1.zip diff --git a/Builds/ActiveIS.UmbracoForms.ConfirmInput_1.0.1.zip b/Builds/ActiveIS.UmbracoForms.ConfirmInput_1.0.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..519dd9d1cea69ce719941da768bd2cdd038dce0e GIT binary patch literal 5449 zcma)AWl$Vim&7GF!QCOaGX!^L2$q4tgEI_+yAvdYKp?mWcXx*%fgnMH26uv6kO9K- z?N;r3U+vr4z4ynh^W&VVQ@5+Ty0z3$(MXVxkg$;I4ZzwtY^LM@+^3Qb35o6Lk+XD% zd0GR(yt)n+uI83b%1*8hZoCRkjy5n?2cV;~hdZy8z5S6s+@5BJR9dLM{Y~`{vBcOS zizPb?HT#=tdY?1U;XDu*NK*&Th;0}$p|(zpsek(An-1z-vv^h{CjQ5d8t(l!03qT!_QYC3VfgmrOv(NJ#Gwm)yX z3}(_eqBO%%rjQS8G_(GF6M`Ps*cBbxr+CNmjt-6(P2uuf&B1R3f(RQ!u>3mCq>&o; z=j8{i$DOq0e`^fUl}*&%g_YdQ?c4P$g)D0ab^D>Z!^D-{Nz2qb6&I@**kZ?T8oTzbBRcv>3tz=h6UV&9o80eMM5rAEQSZYmylItEQU$n_+j- z5hWHN0?0Bue90HqYZ07fz|^9acK5PnRxp^iHaW`9xUIC&Zgc5FS&R@qtln4GQVCz{Gtii(3u{u9p^VJYKUQ>h0luPk)X`VDGNmfCa5N}`>n?OPDox~Ro zuG-%g-KT+@jq==9k1c{2vqy^eC=GoX`#VT}6xyN=I_dHP+{w`yKNV^j_6w!(atmiM z)?EkpNhV=f=$6#)&<#q>gi||ww9cU>6}i9ucr&e}>>Vud0^|gd>4O(UpoEO6%i#hQ zz_ups?-KGG;cR&_asi|I@w2?ASM%vomdpwzcXD4)+2?T6A#H-ISSMdMPDDi`)z29{ z*NL4*8H@bshPvqa)lOqmIu2#_vZ(xx_t5<5CR0e9&=?UP?)4cI4@i(7nU3&`)yYvq zzUT)kVNd4cY6=`)rvm}JwAwk`z^IzMH=HKY0V83Hl|7dWNhQWz9asv z9ri}cq6bS#qm}_*5hel%Dl*OgR^Iyi%{GtfN~I(w&U>K#O|U!KIV+5RUVgEV-%v)D zOWWEnY5~B-QvmLn3qgGajM$gxVGcGoLzZN#MD@oy&EXWL!LLrwEPavf zn^oGL))utDaQDCl{!(DZL9j1X%~PQof|w|V^k9BS^!#Lpw?%Z#mTgF_k5$&VTz~H4 zi{y44q1j1ugRjw@eLEd{&LnbP;;3hLsu!8s&+ap36l%ftNJ`>%i>xMX@J_Iq)7GJ& z=dI!>%e^T+MK0c3oYME}p5dstDikZjr~C?d&H|Jlv&{f~r*chKOq*Zw-Fisfv&5?f zchz6MO}J5~idTed+R~oNaN;mt7==^9P|ajIUTQ|kMF(5v@ ztEf|>%qAHew{FpzvuOBp`qS?T={^_j<(k#uWc3F&&={cVO@!tij1xdPA{y=fu6aaI zU22mGGWp?TGOEqNYH)ISD2^M?s=lGv-U?p>F}X#)7Iyq zXfq)p)Nlt7qicGcQ)+$rV&wb&6>GG3IP+L=9W3VOb8vV$yBc9}t^ChfL5P2|H93tp z^x%wfbY=rMS2u|h9TEO4uDtKU**9?9Tax~V4i2>%?Zh*>-Zw=yAVf=Uc7^LZ_7LEb zWQIirm5yIm+=Sd>x+r0c+~_2%`XJfUK*=S;!Z$^igR;o+f}7#z0x~&})5Oyw>m8Ly zLGj3K$7$<8=y}UJMZGs_Og{P4&Z}YPUF$_d2%qiMnIRZdPc*RHf^xuKi3pDza|8gY z7V&$%Vayl_Lg&^Q`Tnqr*kddEeBt&lCOV@d~qN=I+3lnD!W903=t~iKH-!D zE_*0Ry&V;<{KT^P=U%UfzP1*Jx&QS-G*mqyce{oIZk~27g{OHaMQ~bTY7%1T@OhO=%|L8I7-0sKZwx`ZwHmBpAxv_H>$jDQ&S) zPoa~!>(8x6GxZEEMT4RM)H@C(_Li6<&3i4qb0H$pJZyU(ccyF+_}?iwKF(yn7gY8f ztlJ-A`DBL=&J_C>0#b5^@S2kWjS!bZp^5;nTFP?$oN&i!1T|vLi4OBT{JQxmSyp z>shb-Ps)AeKb-4gKui}tE->9SF1N@IbP!!c9pDugv^jW<4r0E5Gok))loSQve|Y5} z$At;&p+tTY!qdSn>i&Z^HV1vV#8Mqvt|%odQ^u{A_Qf+{3_)V<=gePs?NyQ?7V^WMOF^_A?wEXMuJ`w zs=C!P94O{%?~rZ9zE8}cPVDDNCn3#oa2W}FL1l&5e;3aZtILvFuKGdMVQC7Z zQ;FqeM7WMYjA-`2XB8WG6bA}VYZ;+~Zm50T_H431a6==Fz?&R6_gHtAfOs(a4){Y+2+g$V=E7*6z};!Qdv3sW^t+fJuEm?Qf*^a?j3x+m|Zx%!CzmIm_w#J@3TsWlf%S zJW<=a9Q|OdR|PeyDi2aSndNn8U-{7}Uhkmxcx603dt_AS?eg`g4)dh?hRAVqnoNd2 zvy5#^J#eFy=%mGHvy(!uq46ic3cw1^AWBJsndltl?2F}}vtU%$GRE#1nt)bI*uXzSk| zAKrGJ@Y-DC)9-hbF^z;L{NNem>mnW~UJ4QC)CQXrr60`ho5vaGs4r*y{Nhw^SOzT1 ztPJp?0`u=Li?()1d!JP+uC!l^omu&vHH@{@jU&3)hI6;H>MSpVSMCB=eMTM#b{#u* zhHBfDDBf2~M6xj8`|R#*r+iC_(ElY7vw=~t$>xo|arRnNof=^mb6nh92M63gFk*L&vIhjxsR<+lb%GuSeIt-7*SsUR zb-Tw$#ABRV^Q$VqK8%|+P>tw9Vd#!&m2=gfH0{Rj ze8!;HLS8$&V|SvnlyAfO1l0O=DHU&AeY2A^U4Y)J3r+{^6DOg}x86K=|%kK);H9)i=bM*lUjK!It@RHfmdw*YMqr=a?__3Nyt?;K_ zrAkLRLn-7DX zq#O^m-RgB!khXR^^u6YtaOu`wte-i~sJ>UEQW9ys_!NHXtAAcrlDL(ynt5eTw@Wov zifj0$))s!GTm+t}UVmIi8=SwI0Wr#QpkN0@Xn!SF)e<$_2*yfM3YEU0N^Bx@KHyn+ zt}eAo4zcaumNMj;W^%nVG~m^_#BUZ6jiEkm*%+X3sDm6<1ft4SZ4uvX5pQ0$7>u*PPZCtQm}m*R2ISLvz9=t>T_{h;Xnu>k-tF%z0cUaaX~?=p7fs zkVe%!=XjaOE|QKA!;PzGe6&m|}>qRaQKfZO3!t zWp>|_YuE^+#fnNd*1`UkGou=1{)Nv&6Ir2Zki?&zKF`6A%8Ux^O ze|X&w%>-1+fb91!Wk%7LmrB~h`3M>7QsLG9SG1JiXM+h3h?j0$)PPpT^pneXDenCz_%DCm$^iEm7fI+`aJ3c4HhmslO< z3;HuvZrX?i$-&ceC4Qqw--~2bKN^>|1nMAvKcqOqFP%9Oc_Lz^Ol5)#!w7+#r= z!*&45fRfekK;_V5YTtge@w9gw2XWr-FRk!Dr3sH-w>q=wMb@CLCL+2;$vFyBxVzlY8bVS9 zc^OUw7Sxw!b%ssJt~I2FB{hyh<#j?Cx7{&_T$wV66^?C2_y@Arnm$c1Hoj9xZBY`y z0=pWulJpz-v3_QF0b25w#*?9)YvF>aPw?6j^H%Jn;RWD9W)6YBZsOxtD4;E0yV<|H z4{-e8&(J+n0r~cMv1}#>rnQ&neP6IcYi@6OoV&m+T_?Nmuc?a3P(_)dty3tbwT--! zZ!4__W$O63u~b=Cfz>8tJndhDpeblHy*g zUf0W-_rK3>eW7xlNwn)9iJ5hQ9G&PFOt5fF=8A%nG`m#W%AWpT*sjG*7S^dG9Bv#q z=qUJjSm2ywj;TGG&THAAmw8%ds}ptu>GR?4&kqNr6|l{Zv1PjVI*nw?wMA`tDS6WL zUDV{DH!!nx$udS~1l0ub5x>Vsnu~CzjIlIC2o3Y3J#*ddBd@6Txp)Qm*V_6%G=4kI zCTQSTk+aNa!WbbS%gOL7dGpBdYVgc~CMlaI1(paT`1bmt$iywrWTfxfLSL*|2S*FU znfdHeCAb!plkSZ7!LRedxP8_ZVB`M?Gdu38{~RRR$#Lw2FMu#n5JitZT)PSTm51&e z77=+1yOH{wYD4)i1&Z!<=;pB6Y>2us*~W~Xz=fi h|AgAV8pVnKcMNN(p+7M!5)%5;HF?7P?DKzB{{eHs?%DtV literal 0 HcmV?d00001 diff --git a/Builds/NuGet/ActiveIS.UmbracoForms.ConfirmInput.nuspec b/Builds/NuGet/ActiveIS.UmbracoForms.ConfirmInput.nuspec index 9f37977..c9fcd7c 100644 --- a/Builds/NuGet/ActiveIS.UmbracoForms.ConfirmInput.nuspec +++ b/Builds/NuGet/ActiveIS.UmbracoForms.ConfirmInput.nuspec @@ -2,7 +2,7 @@ ActiveIS.UmbracoForms.ConfirmInput - 1.0.0 + 1.0.1 ActiveIS.UmbracoForms.ConfirmInput ActiveIS ActiveIS diff --git a/TestSite/App_Data/packages/createdPackages.config b/TestSite/App_Data/packages/createdPackages.config index 83eb2b7..f0bf2fb 100644 --- a/TestSite/App_Data/packages/createdPackages.config +++ b/TestSite/App_Data/packages/createdPackages.config @@ -1,6 +1,6 @@  - +