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

Merge branch '1.10.x' into dev

Browse Source
This commit is contained in:
Sebastien Ros
2016-10-06 13:16:03 -07:00
parent b9c30fedb8 2a8d091e07
commit 3672c96951
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Orchard.Web/Modules/Orchard.Tags/Views/Parts/TagCloud.cshtml
View File

@@ -1,12 +1,19 @@
@using Orchard.Tags.Models
@using Orchard.Tags.Models
<ul class="tag-cloud">
@foreach (TagCount tagCount in Model.TagCounts) {
<li class="tag-cloud-tag tag-cloud-tag-@tagCount.Bucket">
@Html.ActionLink(tagCount.TagName, "Search", "Home", new {
area = "Orchard.Tags",
tagName = tagCount.TagName
}, null
)
</li>
}
</ul>
@if (((IEnumerable<object>)Model.TagCounts).Any()) {
foreach (TagCount tagCount in Model.TagCounts) {
<li class="tag-cloud-tag tag-cloud-tag-@tagCount.Bucket">
@Html.ActionLink(tagCount.TagName, "Search", "Home", new {
area = "Orchard.Tags",
tagName = tagCount.TagName
}, null
)
</li>
}
}
else {
<li>
@T("There are no tags to display.")
</li>
}
</ul>

5
src/Orchard/ContentManagement/DefaultContentManager.cs
View File

@@ -277,7 +277,8 @@ namespace Orchard.ContentManagement {
return _contentItemVersionRepository
.Fetch(x => x.ContentItemRecord.Id == id)
.OrderBy(x => x.Number)
.Select(x => Get(x.Id, VersionOptions.VersionRecord(x.Id)));
.Select(x => Get(x.Id, VersionOptions.VersionRecord(x.Id)))
.Where(ci => ci != null);
}
public IEnumerable<T> GetMany<T>(IEnumerable<int> ids, VersionOptions options, QueryHints hints) where T : class, IContent {
@@ -301,6 +302,7 @@ namespace Orchard.ContentManagement {
var itemsById = contentItemVersionRecords
.Select(r => Get(r.ContentItemRecord.Id, options.IsDraftRequired ? options : VersionOptions.VersionRecord(r.Id)))
.Where(ci => ci != null)
.GroupBy(ci => ci.Id)
.ToDictionary(g => g.Key);
@@ -317,6 +319,7 @@ namespace Orchard.ContentManagement {
var itemsById = contentItemVersionRecords
.Select(r => Get(r.ContentItemRecord.Id, VersionOptions.VersionRecord(r.Id)))
.Where(ci => ci != null)
.GroupBy(ci => ci.VersionRecord.Id)
.ToDictionary(g => g.Key);