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

- Some more refactoring, IExtensionManager.AvailableExtensions should be used instead of the obsoleted ActiveExtensions method to query extensions in the system.

Browse Source 
- ActiveExtensions will be removed once the HackInstallationGenerator is removed.

--HG--
branch : dev
This commit is contained in:
Suha Can
2010-04-26 16:52:31 -07:00
parent 4eb92e63ec
commit 9819dfa8b1
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Orchard/Environment/Extensions/IExtensionManager.cs
View File

@@ -6,9 +6,10 @@ namespace Orchard.Environment.Extensions {
public interface IExtensionManager {
IEnumerable<ExtensionDescriptor> AvailableExtensions();
IEnumerable<Feature> LoadFeatures(IEnumerable<FeatureDescriptor> featureDescriptors);
IEnumerable<ExtensionEntry> ActiveExtensions_Obsolete();
void InstallExtension(string extensionType, HttpPostedFileBase extensionBundle);
void UninstallExtension(string extensionType, string extensionName);
// Used by the HackInstallationGenerator and will be removed along with it.
IEnumerable<ExtensionEntry> ActiveExtensions_Obsolete();
}
}

6
src/Orchard/Mvc/ViewEngines/ViewEngineFilter.cs
View File

@@ -52,10 +52,10 @@ namespace Orchard.Mvc.ViewEngines {
}
var modules = _extensionManager.ActiveExtensions_Obsolete()
.Where(x => x.Descriptor.ExtensionType == "Module");
var modules = _extensionManager.AvailableExtensions()
.Where(x => x.ExtensionType == "Module");
var moduleLocations = modules.Select(x => Path.Combine(x.Descriptor.Location, x.Descriptor.Name));
var moduleLocations = modules.Select(x => Path.Combine(x.Location, x.Name));
var moduleViewEngines = _viewEngineProviders
.Select(x => x.CreateModulesViewEngine(new CreateModulesViewEngineParams { VirtualPaths = moduleLocations }));
Logger.Debug("Module locations:\r\n\t-{0}", string.Join("\r\n\t-", moduleLocations.ToArray()));