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

#18131: Fixing Aggregate fetching mode for to-many relationships

Browse Source 
Work Item: 18131

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-09-22 17:56:45 -07:00
parent cdaea02714
commit 58ef655f8e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
View File

@@ -16,7 +16,6 @@ namespace Orchard.Tags.Controllers {
private readonly ITagService _tagService;
private readonly IContentManager _contentManager;
private readonly ISiteService _siteService;
private readonly dynamic _shapeFactory;
public HomeController(
ITagService tagService,
@@ -26,12 +25,13 @@ namespace Orchard.Tags.Controllers {
_tagService = tagService;
_contentManager = contentManager;
_siteService = siteService;
_shapeFactory = shapeFactory;
Shape = shapeFactory;
T = NullLocalizer.Instance;
}
public ILogger Logger { get; set; }
public Localizer T { get; set; }
public dynamic Shape { get; set; }
public ActionResult Index() {
var tags = _tagService.GetTags();
@@ -48,17 +48,17 @@ namespace Orchard.Tags.Controllers {
return RedirectToAction("Index");
}
var taggedItems = _tagService.GetTaggedContentItems(tag.Id, pager.GetStartIndex(), pager.PageSize)
.Select(item => _contentManager.BuildDisplay(item, "Summary"));
var taggedItems = _tagService.GetTaggedContentItems(tag.Id, pager.GetStartIndex(), pager.PageSize).ToList();
var tagShapes = taggedItems.Select(item => _contentManager.BuildDisplay(item, "Summary"));
var list = _shapeFactory.List();
list.AddRange(taggedItems);
var list = Shape.List();
list.AddRange(tagShapes);
var totalItemCount = _tagService.GetTaggedContentItemCount(tag.Id);
var viewModel = new TagsSearchViewModel {
TagName = tag.TagName,
List = list,
Pager = _shapeFactory.Pager(pager).TotalItemCount(totalItemCount)
Pager = Shape.Pager(pager).TotalItemCount(totalItemCount)
};
return View(viewModel);

4
src/Orchard/Data/Conventions/AggregateAttribute.cs
View File

@@ -26,9 +26,9 @@ namespace Orchard.Data.Conventions
criteria.Expect(x => x.Property != null && x.Property.IsDefined(typeof(AggregateAttribute), false));
}
public void Apply(IOneToManyCollectionInstance instance)
public void Apply(IOneToManyCollectionInstance instance)
{
instance.Fetch.Join();
instance.Fetch.Select();
}
public void Accept(IAcceptanceCriteria<IOneToManyCollectionInspector> criteria)