mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Removing priority from extensions and making them feature specific.
--HG-- branch : dev
This commit is contained in:
@@ -202,7 +202,7 @@ namespace Orchard.Environment.Extensions {
|
||||
availableExtensions.OrderByDependenciesAndPriorities(
|
||||
(item, dep) => referencesByModule.ContainsKey(item.Id) &&
|
||||
referencesByModule[item.Id].Any(r => StringComparer.OrdinalIgnoreCase.Equals(dep.Id, r.Name)),
|
||||
(item) => item.Priority)
|
||||
(item) => 0)
|
||||
.ToList();
|
||||
|
||||
return new ExtensionLoadingContext {
|
||||
|
@@ -100,7 +100,6 @@ namespace Orchard.Environment.Extensions.Folders {
|
||||
AntiForgery = GetValue(manifest, "AntiForgery"),
|
||||
Zones = GetValue(manifest, "Zones"),
|
||||
BaseTheme = GetValue(manifest, "BaseTheme"),
|
||||
Priority = int.Parse(GetValue(manifest, "Priority") ?? "0")
|
||||
};
|
||||
extensionDescriptor.Features = GetFeaturesForExtension(manifest, extensionDescriptor);
|
||||
|
||||
@@ -204,7 +203,7 @@ namespace Orchard.Environment.Extensions.Folders {
|
||||
FeatureDescriptor defaultFeature = new FeatureDescriptor {
|
||||
Id = extensionDescriptor.Id,
|
||||
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,
|
||||
Dependencies = ParseFeatureDependenciesEntry(GetValue(manifest, "Dependencies")),
|
||||
Extension = extensionDescriptor,
|
||||
@@ -234,7 +233,6 @@ namespace Orchard.Environment.Extensions.Folders {
|
||||
if (featureDescriptorId == extensionDescriptor.Id) {
|
||||
featureDescriptor = defaultFeature;
|
||||
featureDescriptor.Name = extensionDescriptor.Name;
|
||||
featureDescriptor.Priority = extensionDescriptor.Priority;
|
||||
}
|
||||
else {
|
||||
featureDescriptor = new FeatureDescriptor {
|
||||
|
@@ -29,7 +29,6 @@ namespace Orchard.Environment.Extensions.Models {
|
||||
public string AntiForgery { get; set; }
|
||||
public string Zones { get; set; }
|
||||
public string BaseTheme { get; set; }
|
||||
public int Priority { get; set; }
|
||||
|
||||
public IEnumerable<FeatureDescriptor> Features { get; set; }
|
||||
}
|
||||
|
Reference in New Issue
Block a user