lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-06-28 15:34:39 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed duplicate field shape issue with Content Field elements.

Browse Source 
Fixes #5974
This commit is contained in:
Sipke Schoorstra 2015-12-08 01:15:41 +01:00
parent 68b3fe56d0
commit 3a7091467b
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Orchard.Web/Modules/Orchard.Layouts/Services/ContentFieldDisplay.cs
View File

@ -33,7 +33,7 @@ namespace Orchard.Layouts.Services {
var drivers = GetFieldDrivers(field.FieldDefinition.Name); var drivers = GetFieldDrivers(field.FieldDefinition.Name);
drivers.Invoke(driver => { drivers.Invoke(driver => {
var result = driver.BuildDisplayShape(context); var result = Filter(driver.BuildDisplayShape(context), field);
if (result != null) if (result != null)
result.Apply(context); result.Apply(context);
}, Logger); }, Logger);
@ -67,6 +67,21 @@ namespace Orchard.Layouts.Services {
return context.Shape; return context.Shape;
} }
private DriverResult Filter(DriverResult driverResult, ContentField field) {
DriverResult result = null;
var combinedResult = driverResult as CombinedResult;
var contentShapeResult = driverResult as ContentShapeResult;
if (combinedResult != null) {
result = combinedResult.GetResults().SingleOrDefault(x => x.ContentField != null && x.ContentField.Name == field.Name);
}
else if (contentShapeResult != null) {
result = contentShapeResult.ContentField != null && contentShapeResult.ContentField.Name == field.Name ? contentShapeResult : driverResult;
}
return result;
}
private IEnumerable<IContentFieldDriver> GetFieldDrivers(string fieldName) { private IEnumerable<IContentFieldDriver> GetFieldDrivers(string fieldName) {
return _contentFieldDrivers.Where(x => x.GetType().BaseType.GenericTypeArguments[0].Name == fieldName); return _contentFieldDrivers.Where(x => x.GetType().BaseType.GenericTypeArguments[0].Name == fieldName);
} }