lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-25 19:17:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added join to order results of the query (#7860)

Browse Source 
Fixes #7859
This commit is contained in:
Matteo Piovanelli
2017-09-21 21:09:42 +02:00
committed by Sébastien Ros
parent e407bb86aa
commit 244ea89b27
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Core/Containers/Drivers/ContainerWidgetPartDriver.cs
View File

@@ -32,7 +32,8 @@ namespace Orchard.Core.Containers.Drivers {
IContentQuery<ContentItem> query = _contentManager IContentQuery<ContentItem> query = _contentManager
.Query(VersionOptions.Published) .Query(VersionOptions.Published)
.Join<CommonPartRecord>().Where(cr => cr.Container.Id == container.Id); .Join<CommonPartRecord>().Where(cr => cr.Container.Id == container.Id)
.Join<ContainablePartRecord>().OrderByDescending(x => x.Position);
if (part.Record.ApplyFilter) if (part.Record.ApplyFilter)
query = query.Where(part.Record.FilterByProperty, part.Record.FilterByOperator, part.Record.FilterByValue); query = query.Where(part.Record.FilterByProperty, part.Record.FilterByOperator, part.Record.FilterByValue);
@@ -54,7 +55,7 @@ namespace Orchard.Core.Containers.Drivers {
return ContentShape( return ContentShape(
"Parts_ContainerWidget_Edit", "Parts_ContainerWidget_Edit",
() => { () => {
var model = new ContainerWidgetViewModel {Part = part}; var model = new ContainerWidgetViewModel { Part = part };
var containers = _contentManager.Query<ContainerPart, ContainerPartRecord>(VersionOptions.Latest).List().ToArray(); var containers = _contentManager.Query<ContainerPart, ContainerPartRecord>(VersionOptions.Latest).List().ToArray();
if (updater != null) { if (updater != null) {
@@ -67,12 +68,12 @@ namespace Orchard.Core.Containers.Drivers {
} }
var listItems = !containers.Any() var listItems = !containers.Any()
? new[] {new SelectListItem {Text = T("(None - create container enabled items first)").Text, Value = "0"}} ? new[] { new SelectListItem { Text = T("(None - create container enabled items first)").Text, Value = "0" } }
: containers.Select(x => new SelectListItem { : containers.Select(x => new SelectListItem {
Value = Convert.ToString(x.Id), Value = Convert.ToString(x.Id),
Text = x.ContentItem.TypeDefinition.DisplayName + ": " + _contentManager.GetItemMetadata(x.ContentItem).DisplayText, Text = x.ContentItem.TypeDefinition.DisplayName + ": " + _contentManager.GetItemMetadata(x.ContentItem).DisplayText,
Selected = x.Id == model.Part.Record.ContainerId, Selected = x.Id == model.Part.Record.ContainerId,
}); });
model.AvailableContainers = new SelectList(listItems, "Value", "Text", model.Part.Record.ContainerId); model.AvailableContainers = new SelectList(listItems, "Value", "Text", model.Part.Record.ContainerId);