lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6569 from jtkech/patch-6

Browse Source 
[Fixes #6544] NRE with containable part & Orchard.Lists
This commit is contained in:
Sébastien Ros
2016-03-11 09:28:55 -08:00
parent 5e6a1549ad af7da7963e
commit 32bf5ed6c8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Modules/Orchard.Lists/Shapes.cs
View File

@@ -24,6 +24,8 @@ namespace Orchard.Lists {
builder.Describe("ListNavigation").OnDisplaying(context => {
var containable = (ContainablePart) context.Shape.ContainablePart;
var container = _containerService.Value.GetContainer(containable, VersionOptions.Latest);
if (container == null) return;
var previous = _containerService.Value.Previous(container.Id, containable);
var next = _containerService.Value.Next(container.Id, containable);
@@ -32,4 +34,4 @@ namespace Orchard.Lists {
});
}
}
}
}

4
src/Orchard.Web/Modules/Orchard.Lists/Views/Admin/List.cshtml
View File

@@ -3,7 +3,7 @@
@using Orchard.ContentManagement;
@{
Style.Require("jQueryColorBox");
Style.Include("nprogress.css", "nprogress.min.css");
Style.Include("nprogress.css");
Style.Include("common-admin.css", "common-admin.min.css");
Style.Include("list-admin.css", "list-admin.min.css");
Script.Require("ContentPicker").AtFoot();
@@ -39,4 +39,4 @@
</div>
@if (Model.ListNavigation != null) {
@Display(Model.ListNavigation)
}
}