From 8eb360784beadc16769e27cfce1c0babedccd22e Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 18 Oct 2012 11:02:57 -0700
Subject: [PATCH] #19161: Fixing NRE when editing the placement for widgets

Work Item: 19161

--HG--
branch : 1.x
---
 .../Orchard.ContentTypes/Controllers/AdminController.cs    | 3 ---
 .../Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml  | 7 ++++++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
index 21c808adc..3f1610711 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Controllers/AdminController.cs
@@ -144,9 +144,6 @@ namespace Orchard.ContentTypes.Controllers {
             if (contentTypeDefinition == null)
                 return HttpNotFound();
 
-            var content = Services.ContentManager.New(id);
-            var shape = Services.ContentManager.BuildEditor(content);
-
             var placementModel = new EditPlacementViewModel {
                 PlacementSettings = contentTypeDefinition.GetPlacement(PlacementType.Editor),
                 AllPlacements = _placementService.GetEditorPlacement(id).OrderBy(x => x.PlacementSettings.Position, new FlatPositionComparer()).ThenBy(x => x.PlacementSettings.ShapeType).ToList(), 
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
index d08b3db89..aba5e4829 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPlacement.cshtml
@@ -24,7 +24,12 @@
             
             <li data-shape-type="@placement.ShapeType" data-shape-differentiator="@placement.Differentiator" data-shape-zone="Content" data-shape-position="@placement.Position">
                 <div class="shape-type"><h3>@placement.ShapeType @placement.Differentiator</h3></div>
-                <div class="shape-editor">@Display(Model.AllPlacements[i].Shape)</div>
+                @try {
+                    <div class="shape-editor">@Display(Model.AllPlacements[i].Shape)</div>
+                }
+                catch {
+                }
+                
                 @*  @shape.Position @(Model.PlacementSettings.Any(x => x.Equals(shape)))*@
                 @Html.HiddenFor(m => m.AllPlacements[i].PlacementSettings.ShapeType, new { @class = "type" })
                 @Html.HiddenFor(m => m.AllPlacements[i].PlacementSettings.Differentiator, new { @class = "differentiator" })