Merge pull request #5852 from Codinlab/issue/5737

[Fixes #5737] ChangeListView throws NRE on unpublished Lists
This commit is contained in:
Sébastien Ros 2015-10-08 12:27:02 -07:00
commit 1e87eee2e4

View File

@ -380,7 +380,11 @@ namespace Orchard.Lists.Controllers {
[HttpPost, ActionName("List")] [HttpPost, ActionName("List")]
[FormValueRequired("listViewName")] [FormValueRequired("listViewName")]
public ActionResult ChangeListView(int containerId, string listViewName, PagerParameters pagerParameters) { public ActionResult ChangeListView(int containerId, string listViewName, PagerParameters pagerParameters) {
var container = _containerService.Get(containerId); var container = _containerService.Get(containerId, VersionOptions.Latest);
if (container == null || !container.Has<ContainerPart>()) {
return HttpNotFound();
}
container.Record.AdminListViewName = listViewName; container.Record.AdminListViewName = listViewName;
return RedirectToAction("List", new { containerId, page = pagerParameters.Page, pageSize = pagerParameters.PageSize }); return RedirectToAction("List", new { containerId, page = pagerParameters.Page, pageSize = pagerParameters.PageSize });
} }