lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-07-16 15:25:12 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Adding IsTheme and IsModule static methods.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues 2010-12-01 17:52:10 -08:00
parent f3f518b0db
commit d3eb21e8de
14 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.CodeGeneration/Commands/CodeGenerationCommands.cs
View File

@ -51,7 +51,7 @@ namespace Orchard.CodeGeneration.Commands {
public bool CreateDataMigration(string featureName) { public bool CreateDataMigration(string featureName) {
Context.Output.WriteLine(T("Creating Data Migration for {0}", featureName)); Context.Output.WriteLine(T("Creating Data Migration for {0}", featureName));
ExtensionDescriptor extensionDescriptor = _extensionManager.AvailableExtensions().FirstOrDefault(extension => extension.ExtensionType == DefaultExtensionTypes.Module && ExtensionDescriptor extensionDescriptor = _extensionManager.AvailableExtensions().FirstOrDefault(extension => DefaultExtensionTypes.IsModule(extension.ExtensionType) &&
extension.Features.Any(feature => String.Equals(feature.Id, featureName, StringComparison.OrdinalIgnoreCase))); extension.Features.Any(feature => String.Equals(feature.Id, featureName, StringComparison.OrdinalIgnoreCase)));
if (extensionDescriptor == null) { if (extensionDescriptor == null) {
@ -152,7 +152,7 @@ namespace Orchard.CodeGeneration.Commands {
public void CreateController(string moduleName, string controllerName) { public void CreateController(string moduleName, string controllerName) {
Context.Output.WriteLine(T("Creating Controller {0} in Module {1}", controllerName, moduleName)); Context.Output.WriteLine(T("Creating Controller {0} in Module {1}", controllerName, moduleName));
ExtensionDescriptor extensionDescriptor = _extensionManager.AvailableExtensions().FirstOrDefault(extension => extension.ExtensionType == DefaultExtensionTypes.Module && ExtensionDescriptor extensionDescriptor = _extensionManager.AvailableExtensions().FirstOrDefault(extension => DefaultExtensionTypes.IsModule(extension.ExtensionType) &&
string.Equals(moduleName, extension.Name, StringComparison.OrdinalIgnoreCase)); string.Equals(moduleName, extension.Name, StringComparison.OrdinalIgnoreCase));
if (extensionDescriptor == null) { if (extensionDescriptor == null) {

4
src/Orchard.Web/Modules/Orchard.Modules/Controllers/AdminController.cs
View File

@ -47,7 +47,7 @@ namespace Orchard.Modules.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageModules, T("Not allowed to manage modules"))) if (!Services.Authorizer.Authorize(Permissions.ManageModules, T("Not allowed to manage modules")))
return new HttpUnauthorizedResult(); return new HttpUnauthorizedResult();
var modules = _extensionManager.AvailableExtensions().Where(x => x.ExtensionType == DefaultExtensionTypes.Module); var modules = _extensionManager.AvailableExtensions().Where(x => DefaultExtensionTypes.IsModule(x.ExtensionType));
return View(new ModulesIndexViewModel { return View(new ModulesIndexViewModel {
Modules = modules, Modules = modules,
@ -61,7 +61,7 @@ namespace Orchard.Modules.Controllers {
var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate(); var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate();
var features = _featureManager.GetAvailableFeatures() var features = _featureManager.GetAvailableFeatures()
.Where(f => !f.Extension.ExtensionType.Equals(DefaultExtensionTypes.Theme, StringComparison.OrdinalIgnoreCase)) .Where(f => !DefaultExtensionTypes.IsTheme(f.Extension.ExtensionType))
.Select(f=>new ModuleFeature{Descriptor=f, .Select(f=>new ModuleFeature{Descriptor=f,
IsEnabled=_shellDescriptor.Features.Any(sf=>sf.Name==f.Id), IsEnabled=_shellDescriptor.Features.Any(sf=>sf.Name==f.Id),
NeedsUpdate=featuresThatNeedUpdate.Contains(f.Id)}) NeedsUpdate=featuresThatNeedUpdate.Contains(f.Id)})

5
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageBuilder.cs
View File

@ -46,8 +46,7 @@ namespace Orchard.Packaging.Services {
EmbedVirtualFile(context, projectFile, MediaTypeNames.Text.Xml); EmbedVirtualFile(context, projectFile, MediaTypeNames.Text.Xml);
EmbedProjectFiles(context, "Compile", "Content", "None", "EmbeddedResource"); EmbedProjectFiles(context, "Compile", "Content", "None", "EmbeddedResource");
EmbedReferenceFiles(context); EmbedReferenceFiles(context);
} } else if (DefaultExtensionTypes.IsTheme(extensionDescriptor.ExtensionType)) {
else if (extensionDescriptor.ExtensionType == DefaultExtensionTypes.Theme) {
// this is a simple theme with no csproj // this is a simple theme with no csproj
EmbedThemeFiles(context); EmbedThemeFiles(context);
} }
@ -141,7 +140,7 @@ namespace Orchard.Packaging.Services {
private static void EstablishPaths(CreateContext context, IWebSiteFolder webSiteFolder, string locationPath, string moduleName, string moduleType) { private static void EstablishPaths(CreateContext context, IWebSiteFolder webSiteFolder, string locationPath, string moduleName, string moduleType) {
context.SourceFolder = webSiteFolder; context.SourceFolder = webSiteFolder;
if (moduleType == DefaultExtensionTypes.Theme) { if (DefaultExtensionTypes.IsTheme(moduleType)) {
context.SourcePath = "~/Themes/" + moduleName + "/"; context.SourcePath = "~/Themes/" + moduleName + "/";
context.TargetPath = "\\Content\\Themes\\" + moduleName + "\\"; context.TargetPath = "\\Content\\Themes\\" + moduleName + "\\";
} }

2
src/Orchard.Web/Modules/Orchard.Themes/Controllers/AdminController.cs
View File

@ -59,7 +59,7 @@ namespace Orchard.Themes.Controllers {
var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate(); var featuresThatNeedUpdate = _dataMigrationManager.GetFeaturesThatNeedUpdate();
var themes = _extensionManager.AvailableExtensions() var themes = _extensionManager.AvailableExtensions()
.Where(d => d.ExtensionType == DefaultExtensionTypes.Theme) .Where(d => DefaultExtensionTypes.IsTheme(d.ExtensionType))
.Select(d => new ThemeEntry { .Select(d => new ThemeEntry {
Descriptor = d, Descriptor = d,
NeedsUpdate = featuresThatNeedUpdate.Contains(d.Id), NeedsUpdate = featuresThatNeedUpdate.Contains(d.Id),

2
src/Orchard.Web/Modules/Orchard.Themes/Preview/PreviewThemeFilter.cs
View File

@ -30,7 +30,7 @@ namespace Orchard.Themes.Preview {
var installedThemes = _featureManager.GetEnabledFeatures() var installedThemes = _featureManager.GetEnabledFeatures()
.Select(x => x.Extension) .Select(x => x.Extension)
.Where(x => x.ExtensionType == DefaultExtensionTypes.Theme) .Where(x => DefaultExtensionTypes.IsTheme(x.ExtensionType))
.Distinct(); .Distinct();
var themeListItems = installedThemes var themeListItems = installedThemes

2
src/Orchard.Web/Modules/Orchard.Themes/Services/ThemeService.cs
View File

@ -110,7 +110,7 @@ namespace Orchard.Themes.Services {
var themes = new List<ExtensionDescriptor>(); var themes = new List<ExtensionDescriptor>();
foreach (var descriptor in extensions) { foreach (var descriptor in extensions) {
if (!string.Equals(descriptor.ExtensionType, DefaultExtensionTypes.Theme, StringComparison.OrdinalIgnoreCase)) { if (!DefaultExtensionTypes.IsTheme(descriptor.ExtensionType)) {
continue; continue;
} }

2
src/Orchard.Web/Modules/Orchard.Widgets/Services/WidgetsService.cs
View File

@ -43,7 +43,7 @@ namespace Orchard.Widgets.Services {
public IEnumerable<string> GetZones() { public IEnumerable<string> GetZones() {
return _featureManager.GetEnabledFeatures() return _featureManager.GetEnabledFeatures()
.Select(x => x.Extension) .Select(x => x.Extension)
.Where(x => x.ExtensionType == DefaultExtensionTypes.Theme) .Where(x => DefaultExtensionTypes.IsTheme(x.ExtensionType))
.SelectMany(x => x.Zones.Split(',')) .SelectMany(x => x.Zones.Split(','))
.Distinct() .Distinct()
.Select(x => x.Trim()) .Select(x => x.Trim())

4
src/Orchard/DisplayManagement/Descriptors/DefaultShapeTableManager.cs
View File

@ -66,11 +66,11 @@ namespace Orchard.DisplayManagement.Descriptors {
} }
var extensionType = alteration.Feature.Descriptor.Extension.ExtensionType; var extensionType = alteration.Feature.Descriptor.Extension.ExtensionType;
if (extensionType == DefaultExtensionTypes.Module) { if (DefaultExtensionTypes.IsModule(extensionType)) {
return true; return true;
} }
if (extensionType == DefaultExtensionTypes.Theme) { if (DefaultExtensionTypes.IsTheme(extensionType)) {
// alterations from themes must be from the given theme or a base theme // alterations from themes must be from the given theme or a base theme
var featureName = alteration.Feature.Descriptor.Id; var featureName = alteration.Feature.Descriptor.Id;
return featureName == themeName || IsBaseTheme(featureName, themeName); return featureName == themeName || IsBaseTheme(featureName, themeName);

2
src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs
View File

@ -102,7 +102,7 @@ namespace Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy {
} }
private bool FeatureIsTheme(FeatureDescriptor fd) { private bool FeatureIsTheme(FeatureDescriptor fd) {
return fd.Extension.ExtensionType == DefaultExtensionTypes.Theme; return DefaultExtensionTypes.IsTheme(fd.Extension.ExtensionType);
} }
private bool FeatureIsEnabled(FeatureDescriptor fd) { private bool FeatureIsEnabled(FeatureDescriptor fd) {

2
src/Orchard/DisplayManagement/Descriptors/ShapeTemplateStrategy/ShapeTemplateBindingStrategy.cs
View File

@ -87,7 +87,7 @@ namespace Orchard.DisplayManagement.Descriptors.ShapeTemplateStrategy {
} }
private bool FeatureIsEnabled(FeatureDescriptor fd) { private bool FeatureIsEnabled(FeatureDescriptor fd) {
return (fd.Extension.ExtensionType == DefaultExtensionTypes.Theme && (fd.Id == "TheAdmin" || fd.Id == "SafeMode")) || return (DefaultExtensionTypes.IsTheme(fd.Extension.ExtensionType) && (fd.Id == "TheAdmin" || fd.Id == "SafeMode")) ||
_shellDescriptor.Features.Any(sf => sf.Name == fd.Id); _shellDescriptor.Features.Any(sf => sf.Name == fd.Id);
} }

4
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
View File

@ -156,7 +156,7 @@ namespace Orchard.Environment.Extensions {
private ExtensionLoadingContext CreateLoadingContext() { private ExtensionLoadingContext CreateLoadingContext() {
var availableExtensions = _extensionManager var availableExtensions = _extensionManager
.AvailableExtensions() .AvailableExtensions()
.Where(d => d.ExtensionType == DefaultExtensionTypes.Module || d.ExtensionType == DefaultExtensionTypes.Theme) .Where(d => DefaultExtensionTypes.IsModule(d.ExtensionType) || DefaultExtensionTypes.IsTheme(d.ExtensionType))
.OrderBy(d => d.Id) .OrderBy(d => d.Id)
.ToList(); .ToList();
@ -293,7 +293,7 @@ namespace Orchard.Environment.Extensions {
monitor(_virtualPathMonitor.WhenPathChanges("~/Themes")); monitor(_virtualPathMonitor.WhenPathChanges("~/Themes"));
// Give loaders a chance to monitor any additional changes // Give loaders a chance to monitor any additional changes
var extensions = _extensionManager.AvailableExtensions().Where(d => d.ExtensionType == DefaultExtensionTypes.Module || d.ExtensionType == DefaultExtensionTypes.Theme).ToList(); var extensions = _extensionManager.AvailableExtensions().Where(d => DefaultExtensionTypes.IsModule(d.ExtensionType) || DefaultExtensionTypes.IsTheme(d.ExtensionType)).ToList();
foreach (var extension in extensions) { foreach (var extension in extensions) {
foreach (var loader in _loaders) { foreach (var loader in _loaders) {
loader.Monitor(extension, monitor); loader.Monitor(extension, monitor);

6
src/Orchard/Environment/Extensions/ExtensionManager.cs
View File

@ -49,13 +49,13 @@ namespace Orchard.Environment.Extensions {
/// <param name="subject"></param> /// <param name="subject"></param>
/// <returns></returns> /// <returns></returns>
internal static bool HasDependency(FeatureDescriptor item, FeatureDescriptor subject) { internal static bool HasDependency(FeatureDescriptor item, FeatureDescriptor subject) {
if (item.Extension.ExtensionType == DefaultExtensionTypes.Theme) { if (DefaultExtensionTypes.IsTheme(item.Extension.ExtensionType)) {
if (subject.Extension.ExtensionType == DefaultExtensionTypes.Module) { if (DefaultExtensionTypes.IsModule(subject.Extension.ExtensionType)) {
// Themes implicitly depend on modules to ensure build and override ordering // Themes implicitly depend on modules to ensure build and override ordering
return true; return true;
} }
if (subject.Extension.ExtensionType == DefaultExtensionTypes.Theme) { if (DefaultExtensionTypes.IsTheme(subject.Extension.ExtensionType)) {
// Theme depends on another if it is its base theme // Theme depends on another if it is its base theme
return item.Extension.BaseTheme == subject.Id; return item.Extension.BaseTheme == subject.Id;
} }

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

@ -1,7 +1,17 @@
namespace Orchard.Environment.Extensions.Models { using System;
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 const string Core = "Core";
public static bool IsModule(string extensionType) {
return string.Equals(extensionType, Module, StringComparison.OrdinalIgnoreCase);
}
public static bool IsTheme(string extensionType) {
return string.Equals(extensionType, Theme, StringComparison.OrdinalIgnoreCase);
}
} }
} }

4
src/Orchard/Localization/Services/DefaultLocalizedStringManager.cs
View File

@ -113,7 +113,7 @@ namespace Orchard.Localization.Services {
} }
foreach (var module in _extensionManager.AvailableExtensions()) { foreach (var module in _extensionManager.AvailableExtensions()) {
if (String.Equals(module.ExtensionType, DefaultExtensionTypes.Module)) { if (DefaultExtensionTypes.IsModule(module.ExtensionType)) {
string modulePath = string.Format(ModulesLocalizationFilePathFormat, module.Id, culture); string modulePath = string.Format(ModulesLocalizationFilePathFormat, module.Id, culture);
text = _webSiteFolder.ReadFile(modulePath); text = _webSiteFolder.ReadFile(modulePath);
if (text != null) { if (text != null) {
@ -124,7 +124,7 @@ namespace Orchard.Localization.Services {
} }
foreach (var theme in _extensionManager.AvailableExtensions()) { foreach (var theme in _extensionManager.AvailableExtensions()) {
if (String.Equals(theme.ExtensionType, DefaultExtensionTypes.Theme)) { if (DefaultExtensionTypes.IsTheme(theme.ExtensionType)) {
string themePath = string.Format(ThemesLocalizationFilePathFormat, theme.Id, culture); string themePath = string.Format(ThemesLocalizationFilePathFormat, theme.Id, culture);
text = _webSiteFolder.ReadFile(themePath); text = _webSiteFolder.ReadFile(themePath);
if (text != null) { if (text != null) {