From a7a225fa2a6aa1435f00fee11ed4b8c41d6be79f Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 24 Nov 2022 21:18:10 +0000 Subject: [PATCH] Changed to use undepreciated method --- .../ActiveIS.UmbracoForms.ConfirmInput.csproj | 14 +++++++------- .../Fields/ConfirmInputField.cs | 6 +++--- ActiveIS.UmbracoForms.ConfirmInput/packages.config | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj b/ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj index a521ad1..96947d6 100644 --- a/ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj +++ b/ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj @@ -146,17 +146,17 @@ ..\packages\UmbracoCms.Core.8.17.2\lib\net472\Umbraco.Core.dll - - ..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Core.dll + + ..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Forms.Core.dll - - ..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Core.Providers.dll + + ..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Forms.Core.Providers.dll - - ..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Web.dll + + ..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Forms.Web.dll - ..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Licensing.dll + ..\packages\UmbracoForms.Core.8.13.4\lib\net472\Umbraco.Licensing.dll diff --git a/ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs b/ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs index bcff708..cf3ff3b 100644 --- a/ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs +++ b/ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs @@ -7,6 +7,7 @@ using Umbraco.Forms.Core.Data.Storage; using Umbraco.Forms.Core.Enums; using Umbraco.Forms.Core.Models; +using Umbraco.Forms.Core.Services; namespace ActiveIS.UmbracoForms.ConfirmInput.Fields { @@ -36,9 +37,8 @@ public override string GetDesignView() public string Placeholder { get; set; } public override IEnumerable ValidateField(Form form, Field field, IEnumerable postedValues, HttpContextBase context, - IFormStorage formStorage) + IFormStorage formStorage, IFieldTypeStorage fieldTypeStorage, List errors) { - var errors = new List(); var fieldValues = postedValues.ToList(); if (!fieldValues[0].ToString().Equals(fieldValues[1].ToString(), StringComparison.InvariantCultureIgnoreCase)) @@ -51,7 +51,7 @@ public override IEnumerable ValidateField(Form form, Field field, IEnume errors.Add(ValidationErrorMessage); } - return errors.Any() ? errors : base.ValidateField(form, field, fieldValues.Take(1), context, formStorage); + return base.ValidateField(form, field, postedValues.Take(1), context, formStorage, fieldTypeStorage, errors); } public override IEnumerable RequiredJavascriptFiles(Field field) diff --git a/ActiveIS.UmbracoForms.ConfirmInput/packages.config b/ActiveIS.UmbracoForms.ConfirmInput/packages.config index c0d06d6..bfba3d2 100644 --- a/ActiveIS.UmbracoForms.ConfirmInput/packages.config +++ b/ActiveIS.UmbracoForms.ConfirmInput/packages.config @@ -29,5 +29,5 @@ - + \ No newline at end of file