From a81d4c0821452189406f3a74b1e8432550d9a1b9 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Wed, 8 Dec 2010 14:44:55 -0800 Subject: [PATCH] Removing incorrect definition of extension type There is no such thing as a "Core" extension type. "Theme" and "Module" are the only valid extension types. --HG-- branch : dev --- src/Orchard.Specs/Bindings/OrchardSiteFactory.cs | 6 +++--- src/Orchard.Specs/Bindings/WebAppHosting.cs | 6 +++--- .../Environment/Extensions/Models/DefaultExtensionTypes.cs | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs index a702b1d20..889a47292 100644 --- a/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs +++ b/src/Orchard.Specs/Bindings/OrchardSiteFactory.cs @@ -21,9 +21,9 @@ namespace Orchard.Specs.Bindings { webApp.GivenIHaveACleanSiteWith( virtualDirectory, TableData( - new { extension = DefaultExtensionTypes.Module, names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" }, - new { extension = DefaultExtensionTypes.Core, names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" }, - new { extension = DefaultExtensionTypes.Theme, names = "SafeMode, TheAdmin, TheThemeMachine" })); + new { extension = "Module", names = "Orchard.Setup, Orchard.Pages, Orchard.Blogs, Orchard.Messaging, Orchard.Modules, Orchard.Packaging, Orchard.PublishLater, Orchard.Themes, Orchard.Scripting, Orchard.Widgets, Orchard.Users, Orchard.Roles, Orchard.Comments, Orchard.jQuery, Orchard.Tags, TinyMce" }, + new { extension = "Core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" }, + new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" })); webApp.WhenIGoTo("Setup"); diff --git a/src/Orchard.Specs/Bindings/WebAppHosting.cs b/src/Orchard.Specs/Bindings/WebAppHosting.cs index 7d3d839fc..7648b2e9d 100644 --- a/src/Orchard.Specs/Bindings/WebAppHosting.cs +++ b/src/Orchard.Specs/Bindings/WebAppHosting.cs @@ -140,13 +140,13 @@ namespace Orchard.Specs.Bindings { foreach (var row in table.Rows) { foreach (var name in row["names"].Split(',').Select(x => x.Trim())) { switch (row["extension"]) { - case DefaultExtensionTypes.Core: + case "Core": GivenIHaveCore(name); break; - case DefaultExtensionTypes.Module: + case "Module": GivenIHaveModule(name); break; - case DefaultExtensionTypes.Theme: + case "Theme": GivenIHaveTheme(name); break; default: diff --git a/src/Orchard/Environment/Extensions/Models/DefaultExtensionTypes.cs b/src/Orchard/Environment/Extensions/Models/DefaultExtensionTypes.cs index 607fe8fcf..372cd2d77 100644 --- a/src/Orchard/Environment/Extensions/Models/DefaultExtensionTypes.cs +++ b/src/Orchard/Environment/Extensions/Models/DefaultExtensionTypes.cs @@ -4,7 +4,6 @@ namespace Orchard.Environment.Extensions.Models { public static class DefaultExtensionTypes { public const string Module = "Module"; public const string Theme = "Theme"; - public const string Core = "Core"; public static bool IsModule(string extensionType) { return string.Equals(extensionType, Module, StringComparison.OrdinalIgnoreCase);