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

Really removing the query.List() from the content list admin's action

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-11-01 09:05:44 -07:00
parent 35f632f9db
commit 75efbf5f0a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -65,7 +65,6 @@ namespace Orchard.Core.Contents.Controllers {
if (model.ContainerId != null) if (model.ContainerId != null)
query = query.Join<CommonPartRecord>().Where(cr => cr.Container.Id == model.ContainerId); query = query.Join<CommonPartRecord>().Where(cr => cr.Container.Id == model.ContainerId);
var contentItems = query.List();
switch (model.Options.OrderBy) { switch (model.Options.OrderBy) {
case ContentsOrder.Modified: case ContentsOrder.Modified:
query = query.OrderByDescending<CommonPartRecord, DateTime?>(cr => cr.ModifiedUtc); query = query.OrderByDescending<CommonPartRecord, DateTime?>(cr => cr.ModifiedUtc);
@@ -89,7 +88,7 @@ namespace Orchard.Core.Contents.Controllers {
var list = Shape.List(); var list = Shape.List();
list.AddRange(pageOfContentItems.Select(ci => _contentManager.BuildDisplay(ci, "SummaryAdmin"))); list.AddRange(pageOfContentItems.Select(ci => _contentManager.BuildDisplay(ci, "SummaryAdmin")));
var hasNextPage = contentItems.Skip(pager.GetStartIndex(pager.Page + 1)).Any(); var hasNextPage = query.Slice(pager.GetStartIndex(pager.Page + 1), 1).Any();
var pagerShape = Shape.Pager(pager).HasNextPage(hasNextPage); var pagerShape = Shape.Pager(pager).HasNextPage(hasNextPage);
var viewModel = Shape.ViewModel() var viewModel = Shape.ViewModel()