lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removing priority from extensions and making them feature specific.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Andre Rodrigues
2011-03-21 13:17:12 -07:00
parent 1749d0468c
commit 4c7f24a7bc
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
+1 -1
View File
@@ -202,7 +202,7 @@ namespace Orchard.Environment.Extensions {
availableExtensions.OrderByDependenciesAndPriorities( availableExtensions.OrderByDependenciesAndPriorities(
(item, dep) => referencesByModule.ContainsKey(item.Id) && (item, dep) => referencesByModule.ContainsKey(item.Id) &&
referencesByModule[item.Id].Any(r => StringComparer.OrdinalIgnoreCase.Equals(dep.Id, r.Name)), referencesByModule[item.Id].Any(r => StringComparer.OrdinalIgnoreCase.Equals(dep.Id, r.Name)),
(item) => item.Priority) (item) => 0)
.ToList(); .ToList();
return new ExtensionLoadingContext { return new ExtensionLoadingContext {
src/Orchard/Environment/Extensions/Folders/ExtensionFolders.cs
+1 -3
View File
@@ -100,7 +100,6 @@ namespace Orchard.Environment.Extensions.Folders {
AntiForgery = GetValue(manifest, "AntiForgery"), AntiForgery = GetValue(manifest, "AntiForgery"),
Zones = GetValue(manifest, "Zones"), Zones = GetValue(manifest, "Zones"),
BaseTheme = GetValue(manifest, "BaseTheme"), BaseTheme = GetValue(manifest, "BaseTheme"),
Priority = int.Parse(GetValue(manifest, "Priority") ?? "0")
}; };
extensionDescriptor.Features = GetFeaturesForExtension(manifest, extensionDescriptor); extensionDescriptor.Features = GetFeaturesForExtension(manifest, extensionDescriptor);
@@ -204,7 +203,7 @@ namespace Orchard.Environment.Extensions.Folders {
FeatureDescriptor defaultFeature = new FeatureDescriptor { FeatureDescriptor defaultFeature = new FeatureDescriptor {
Id = extensionDescriptor.Id, Id = extensionDescriptor.Id,
Name = extensionDescriptor.Name, Name = extensionDescriptor.Name,
Priority = extensionDescriptor.Priority, Priority = GetValue(manifest, "Priority") != null ? int.Parse(GetValue(manifest, "Priority")) : 0,
Description = GetValue(manifest, "FeatureDescription") ?? GetValue(manifest, "Description") ?? string.Empty, Description = GetValue(manifest, "FeatureDescription") ?? GetValue(manifest, "Description") ?? string.Empty,
Dependencies = ParseFeatureDependenciesEntry(GetValue(manifest, "Dependencies")), Dependencies = ParseFeatureDependenciesEntry(GetValue(manifest, "Dependencies")),
Extension = extensionDescriptor, Extension = extensionDescriptor,
@@ -234,7 +233,6 @@ namespace Orchard.Environment.Extensions.Folders {
if (featureDescriptorId == extensionDescriptor.Id) { if (featureDescriptorId == extensionDescriptor.Id) {
featureDescriptor = defaultFeature; featureDescriptor = defaultFeature;
featureDescriptor.Name = extensionDescriptor.Name; featureDescriptor.Name = extensionDescriptor.Name;
featureDescriptor.Priority = extensionDescriptor.Priority;
} }
else { else {
featureDescriptor = new FeatureDescriptor { featureDescriptor = new FeatureDescriptor {
src/Orchard/Environment/Extensions/Models/ExtensionDescriptor.cs
-1
View File
@@ -29,7 +29,6 @@ namespace Orchard.Environment.Extensions.Models {
public string AntiForgery { get; set; } public string AntiForgery { get; set; }
public string Zones { get; set; } public string Zones { get; set; }
public string BaseTheme { get; set; } public string BaseTheme { get; set; }
public int Priority { get; set; }
public IEnumerable<FeatureDescriptor> Features { get; set; } public IEnumerable<FeatureDescriptor> Features { get; set; }
} }