diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs index 925a1a34d..358aa426f 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Rules/Controllers/AdminController.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.Mvc; using System.Web.Routing; +using Orchard.Forms.Services; using Orchard.Rules.Models; using Orchard.Rules.Services; using Orchard.Rules.ViewModels; diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Module.txt b/src/Orchard.Web/Modules/Orchard.Rules/Module.txt index 96e61cb1e..956d1ece0 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Module.txt +++ b/src/Orchard.Web/Modules/Orchard.Rules/Module.txt @@ -2,8 +2,8 @@ Name: Rules AntiForgery: enabled Author: The Orchard Team Website: http://orchardrules.codeplex.com -Version: 1.6 -OrchardVersion: 1.4 +Version: 1.7 +OrchardVersion: 1.7 Description: Provides a system de trigger actions based on events. Features: Orchard.Rules: diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj index dabcc5317..cc7412a33 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj +++ b/src/Orchard.Web/Modules/Orchard.Rules/Orchard.Rules.csproj @@ -142,7 +142,6 @@ - diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Services/FormParametersHelper.cs b/src/Orchard.Web/Modules/Orchard.Rules/Services/FormParametersHelper.cs deleted file mode 100644 index 1e27171cd..000000000 --- a/src/Orchard.Web/Modules/Orchard.Rules/Services/FormParametersHelper.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Xml; -using System.Xml.Linq; - -namespace Orchard.Rules.Services { - public static class FormParametersHelper { - public static string ToString(IDictionary parameters) { - var doc = new XDocument(); - doc.Add(new XElement("Form")); - var root = doc.Root; - - if (root == null) { - return String.Empty; - } - - foreach (var entry in parameters) { - root.Add(new XElement(XmlConvert.EncodeLocalName(entry.Key), entry.Value)); - } - - return doc.ToString(SaveOptions.DisableFormatting); - } - - public static IDictionary FromString(string parameters) { - var result = new Dictionary(); - - if (String.IsNullOrEmpty(parameters)) { - return result; - } - - var doc = XDocument.Parse(parameters); - if (doc.Root == null) { - return result; - } - - foreach (var element in doc.Root.Elements()) { - result.Add(element.Name.LocalName, element.Value); - } - - return result; - } - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Rules/Services/RulesManager.cs b/src/Orchard.Web/Modules/Orchard.Rules/Services/RulesManager.cs index bf1e11a6a..9ff11064d 100644 --- a/src/Orchard.Web/Modules/Orchard.Rules/Services/RulesManager.cs +++ b/src/Orchard.Web/Modules/Orchard.Rules/Services/RulesManager.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Orchard.Forms.Services; using Orchard.Logging; using Orchard.Rules.Models; using Orchard.Data;