From 2a34cb582bd8b36da6992bb925322db1ff76750b Mon Sep 17 00:00:00 2001 From: Lombiq Date: Tue, 21 Jul 2015 23:42:58 +0200 Subject: [PATCH] Reverting that form validation services of Dynamic Forms were moved to a separate feature (should be only on dev) --- .../Activities/DynamicFormValidatingActivity.cs | 1 - .../Forms/DynamicFormValidatingForm.cs | 1 - .../Handlers/WorkflowValidatorCoordinator.cs | 1 - .../Modules/Orchard.DynamicForms/Module.txt | 10 ++-------- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/DynamicFormValidatingActivity.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/DynamicFormValidatingActivity.cs index 8455dcb1b..91f566187 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/DynamicFormValidatingActivity.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Activities/DynamicFormValidatingActivity.cs @@ -7,7 +7,6 @@ using Orchard.Workflows.Models; using Orchard.Environment.Extensions; namespace Orchard.DynamicForms.Activities { - [OrchardFeature("Orchard.DynamicForms.Activities.Validation")] public class DynamicFormValidatingActivity : DynamicFormActivity { private readonly ICSharpService _csharpService; private readonly IOrchardServices _orchardServices; diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/DynamicFormValidatingForm.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/DynamicFormValidatingForm.cs index c6082167d..53fb5b84b 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/DynamicFormValidatingForm.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Forms/DynamicFormValidatingForm.cs @@ -2,7 +2,6 @@ using Orchard.Forms.Services; namespace Orchard.DynamicForms.Forms { - [OrchardFeature("Orchard.DynamicForms.Activities.Validation")] public class DynamicFormValidatingForm : Component, IFormProvider { public void Describe(DescribeContext context) { context.Form("DynamicFormValidatingScript", shapeFactory => { diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/WorkflowValidatorCoordinator.cs b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/WorkflowValidatorCoordinator.cs index f5198ac3a..15da189c5 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/WorkflowValidatorCoordinator.cs +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Handlers/WorkflowValidatorCoordinator.cs @@ -7,7 +7,6 @@ using Orchard.Layouts.Helpers; using Orchard.Workflows.Services; namespace Orchard.DynamicForms.Handlers { - [OrchardFeature("Orchard.DynamicForms.Activities.Validation")] public class WorkflowValidatorCoordinator : FormEventHandlerBase { private readonly IWorkflowManager _workflowManager; public WorkflowValidatorCoordinator(IWorkflowManager workflowManager) { diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt index 62ab2d809..40be87d9e 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Module.txt @@ -10,7 +10,7 @@ Features: Name: Dynamic Forms Description: Create custom forms like contact forms using layouts. Category: Forms - Dependencies: Orchard.Layouts, Orchard.Tokens, Orchard.Workflows, Orchard.Users, Orchard.Fields, Common + Dependencies: Orchard.Layouts, Orchard.Scripting.CSharp, Orchard.Tokens, Orchard.Workflows, Orchard.Users, Orchard.Fields, Common Orchard.DynamicForms.AntiSpam: Name: Anti-Spam Elements Description: Provides anti-spam elements to protect your content from malicious submissions. @@ -30,10 +30,4 @@ Features: Name: Dynamic Forms Import Export Description: Enables the import and export of form submissions. Category: Forms - Dependencies: Orchard.DynamicForms, Orchard.ImportExport - Orchard.DynamicForms.Activities.Validation: - Name: Dynamic Forms Validation - Description: Provides form validation features. - Category: Forms - Dependencies: Orchard.DynamicForms, Orchard.Scripting.CSharp - \ No newline at end of file + Dependencies: Orchard.DynamicForms, Orchard.ImportExport