lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

ContainerWidget - Handling the case when there's no selected container.

Browse Source 
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.
This commit is contained in:
Sipke Schoorstra
2014-08-06 19:01:49 -07:00
parent fdd6c0aba7
commit a39aa9d8b4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs
View File

@@ -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 {