From a39aa9d8b43023dc6861917d8a4a936bea508857 Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipke@ideliverable.com>
Date: Wed, 6 Aug 2014 19:01:49 -0700
Subject: [PATCH] ContainerWidget - Handling the case when there's no selected
 container.

Previously, the Container Widget would allow the user to not select a container. This is now handled using model validation.
To be safe, we also handle the case when the ContainerId is 0 or does not refer to an existing content item.
---
 .../Containers/Drivers/ContainerWidgetPartDriver.cs  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs b/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs
index f0de8de21..2658ebbee 100644
--- a/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs
+++ b/src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs
@@ -25,7 +25,10 @@ namespace Orchard.Core.Containers.Drivers {
             return ContentShape(
                 "Parts_ContainerWidget",
                 () => {
-                    var container = _contentManager.Get(part.Record.ContainerId);
+                    var container = part.Record.ContainerId != 0 ? _contentManager.Get(part.Record.ContainerId) : default(ContentItem);
+
+                    if (container == null)
+                        return null;
 
                     IContentQuery<ContentItem> query = _contentManager
                         .Query(VersionOptions.Published)
@@ -52,12 +55,17 @@ namespace Orchard.Core.Containers.Drivers {
                 "Parts_ContainerWidget_Edit",
                 () => {
                     var model = new ContainerWidgetViewModel {Part = part};
+                    var containers = _contentManager.Query<ContainerPart, ContainerPartRecord>(VersionOptions.Latest).List().ToArray();
 
                     if (updater != null) {
                         updater.TryUpdateModel(model, "ContainerWidget", null, null);
+
+                        if (model.Part.Record.ContainerId == 0)
+                            updater.AddModelError("Part.Record.ContainerId", containers.Any()
+                                ? T("Please select a container to show items from.")
+                                : T("Please create a container so you can select it to show items from."));
                     }
 
-                    var containers = _contentManager.Query<ContainerPart, ContainerPartRecord>(VersionOptions.Latest).List();
                     var listItems = !containers.Any()
                         ? new[] {new SelectListItem {Text = T("(None - create container enabled items first)").Text, Value = "0"}}
                         : containers.Select(x => new SelectListItem {