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

Fixing recycle bin error.

Browse Source 
Unfortunately we can't sort by ModifiedUtc without grouping by it. The problem with grouping by ModifiedUtc i that it will cause to show items that are no longer deleted. I think we need a Deleted flag.
This commit is contained in:
Sipke Schoorstra
2014-11-12 23:46:22 -08:00
parent 8975f9a505
commit 6761b1c20f
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.AuditTrail/Services/RecycleBin.cs
View File

@@ -26,7 +26,7 @@ namespace Orchard.AuditTrail.Services {
public IPageOfItems<T> List<T>(int page, int pageSize) where T: class, IContent {
var query = GetDeletedVersionsQuery();
var totalCount = query.List().Count;
query.SetFirstResult((page - 1) * pageSize);
query.SetFetchSize(pageSize);
@@ -70,16 +70,13 @@ namespace Orchard.AuditTrail.Services {
// Select only the highest versions where both Published and Latest are false.
var select =
"select max(ContentItemVersionRecord.Id), ContentItemVersionRecord.ContentItemRecord.Id, max(ContentItemVersionRecord.Number) " +
"from Orchard.ContentManagement.Records.ContentItemVersionRecord ContentItemVersionRecord " +
"join ContentItemVersionRecord.ContentItemRecord ContentItemRecord, Orchard.Core.Common.Models.CommonPartVersionRecord CommonPartVersionRecord " +
"where CommonPartVersionRecord.Id = ContentItemVersionRecord.Id ";
"from Orchard.ContentManagement.Records.ContentItemVersionRecord ContentItemVersionRecord ";
var filter = contentItemIds != null ? "and ContentItemVersionRecord.ContentItemRecord.Id in (:ids) " : default(String);
var group =
var group =
"group by ContentItemVersionRecord.ContentItemRecord.Id " +
"having max(cast(Latest as Int32)) = 0 and max(cast(Published as Int32)) = 0 " +
"order by max(CommonPartVersionRecord.ModifiedUtc) desc ";
"having max(cast(Latest as Int32)) = 0 and max(cast(Published as Int32)) = 0 ";
var hql = String.Concat(select, filter, group);
var query = session.CreateQuery(hql);