lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Removing incorrect definition of extension type

Browse Source 
There is no such thing as a "Core" extension type.
"Theme" and "Module" are the only valid extension types.

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-12-08 14:44:55 -08:00
parent 9b8a20c222
commit a81d4c0821
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Specs/Bindings/OrchardSiteFactory.cs
View File

@@ -21,9 +21,9 @@ namespace Orchard.Specs.Bindings {
webApp.GivenIHaveACleanSiteWith( webApp.GivenIHaveACleanSiteWith(
virtualDirectory, virtualDirectory,
TableData( 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 = "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 = "Core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Contents, Routable, Scheduling, Settings, Shapes, XmlRpc" },
new { extension = DefaultExtensionTypes.Theme, names = "SafeMode, TheAdmin, TheThemeMachine" })); new { extension = "Theme", names = "SafeMode, TheAdmin, TheThemeMachine" }));
webApp.WhenIGoTo("Setup"); webApp.WhenIGoTo("Setup");

6
src/Orchard.Specs/Bindings/WebAppHosting.cs
View File

@@ -140,13 +140,13 @@ namespace Orchard.Specs.Bindings {
foreach (var row in table.Rows) { foreach (var row in table.Rows) {
foreach (var name in row["names"].Split(',').Select(x => x.Trim())) { foreach (var name in row["names"].Split(',').Select(x => x.Trim())) {
switch (row["extension"]) { switch (row["extension"]) {
case DefaultExtensionTypes.Core: case "Core":
GivenIHaveCore(name); GivenIHaveCore(name);
break; break;
case DefaultExtensionTypes.Module: case "Module":
GivenIHaveModule(name); GivenIHaveModule(name);
break; break;
case DefaultExtensionTypes.Theme: case "Theme":
GivenIHaveTheme(name); GivenIHaveTheme(name);
break; break;
default: default:

1
src/Orchard/Environment/Extensions/Models/DefaultExtensionTypes.cs
View File

@@ -4,7 +4,6 @@ namespace Orchard.Environment.Extensions.Models {
public static class DefaultExtensionTypes { public static class DefaultExtensionTypes {
public const string Module = "Module"; public const string Module = "Module";
public const string Theme = "Theme"; public const string Theme = "Theme";
public const string Core = "Core";
public static bool IsModule(string extensionType) { public static bool IsModule(string extensionType) {
return string.Equals(extensionType, Module, StringComparison.OrdinalIgnoreCase); return string.Equals(extensionType, Module, StringComparison.OrdinalIgnoreCase);