lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5196 from fakedevil/feature/modified-by

Browse Source 
Adding fallback to owner if VersionModifiedBy is not filled up
This commit is contained in:
Sébastien Ros
2015-04-24 11:10:30 -07:00
parent c0a06becd0 f9523a32b8
commit 21d80434e8
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard.Web/Core/Common/Views/CommonMetadataLastModified.cshtml
View File

@@ -3,11 +3,16 @@
ContentPart
*@
@using Orchard.ContentManagement
@using Orchard.Core.Common.Models;
@{
CommonPart commonPart = Model.ContentPart;
string lastModifiedBy = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().VersionModifiedBy;
string displayUser = null;
if (Model.ContentPart != null) {
if (!string.IsNullOrWhiteSpace(Model.ContentPart.VersionModifiedBy)) {
displayUser = Model.ContentPart.VersionModifiedBy;
}
else if (Model.ContentPart.Owner != null) {
displayUser = Model.ContentPart.Owner.UserName;
}
}
}
@T("By {0}", lastModifiedBy ?? T("unknown").ToString())
@T("By {0}", displayUser ?? T("unknown").ToString())

18
src/Orchard.Web/Core/Common/Views/Parts.Common.Metadata.SummaryAdmin.cshtml
View File

@@ -1,12 +1,10 @@
@using Orchard.ContentManagement;
@using Orchard.Core.Common.Models;
@{
CommonPart commonPart = Model.ContentPart;
DateTime? modifiedUtc = commonPart.As<CommonPart>() == null ? null : commonPart.As<CommonPart>().ModifiedUtc;
@{
DateTime? modifiedUtc = Model.ContentPart == null ? null : Model.ContentPart.ModifiedUtc;
}
<ul class="pageStatus">
<li>@if (modifiedUtc.HasValue) {
@T("Last modified: {0}", Display.DateTimeRelative(DateTimeUtc: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
</li>
<li>@Display.CommonMetadataLastModified(ContentPart: Model.ContentPart)</li>
</ul>
<li>
@if (modifiedUtc.HasValue) {
@T("Last modified: {0}", Display.DateTimeRelative(DateTimeUtc: modifiedUtc.Value))}&nbsp;&#124;&nbsp;
</li>
<li>@Display.CommonMetadataLastModified(ContentPart: Model.ContentPart)</li>
</ul>