From 6ca43296d9f6b7063b07e68d8afcc7e28cd11a71 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 24 Feb 2011 17:04:26 -0800 Subject: [PATCH] Restoring placement.info source file in shape tracing --HG-- branch : dev --- src/Orchard/ContentManagement/DefaultContentDisplay.cs | 2 ++ .../ShapePlacementStrategy/ShapePlacementParsingStrategy.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Orchard/ContentManagement/DefaultContentDisplay.cs b/src/Orchard/ContentManagement/DefaultContentDisplay.cs index 0656c3b05..c3486a5fb 100644 --- a/src/Orchard/ContentManagement/DefaultContentDisplay.cs +++ b/src/Orchard/ContentManagement/DefaultContentDisplay.cs @@ -116,9 +116,11 @@ namespace Orchard.ContentManagement { var placement = descriptor.Placement(placementContext); if(placement != null) { + placement.Source = placementContext.Source; return placement; } } + return new PlacementInfo { Location = defaultLocation, Source = String.Empty diff --git a/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs b/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs index 1f646dafb..8e095aead 100644 --- a/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs +++ b/src/Orchard/DisplayManagement/Descriptors/ShapePlacementStrategy/ShapePlacementParsingStrategy.cs @@ -68,7 +68,7 @@ namespace Orchard.DisplayManagement.Descriptors.ShapePlacementStrategy { predicate = matches.SelectMany(match => match.Terms).Aggregate(predicate, BuildPredicate); } - var placement = new PlacementInfo { }; + var placement = new PlacementInfo(); var segments = shapeLocation.Location.Split(';').Select(s => s.Trim()); foreach (var segment in segments) {