Adding some "List" content type specific UI improvements to the admin.

work item: 16865

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-12-01 15:55:02 -08:00
parent 665e641a13
commit 383938d73d
12 changed files with 137 additions and 19 deletions

View File

@@ -8,7 +8,6 @@ using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.ContentManagement.Records;
using Orchard.Core.Common.Models;
using Orchard.Core.Contents.Settings;
using Orchard.Core.Contents.ViewModels;
@@ -62,9 +61,10 @@ namespace Orchard.Core.Contents.Controllers {
: contentTypeDefinition.Name;
query = query.ForType(model.TypeName);
}
if (model.ContainerId != null)
// content type and container filters are mutually exclusive
else if (model.ContainerId != null) {
query = query.Join<CommonPartRecord>().Where(cr => cr.Container.Id == model.ContainerId);
}
switch (model.Options.OrderBy) {
case ContentsOrder.Modified: