lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-20 18:57:56 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#18065: Fixing date handling in Live Writer

Browse Source 
Work Item: 18065

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-12-01 12:16:25 -08:00
parent c7ed6013c8
commit b46281ce48
3 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs
View File

@@ -51,8 +51,8 @@ namespace Orchard.Core.Feeds.StandardBuilders {
public DateTime? PublishedUtc { public DateTime? PublishedUtc {
get { get {
if (_common != null && _common.PublishedUtc != null) if (_common != null && _common.CreatedUtc != null)
return _common.PublishedUtc; return _common.CreatedUtc;
return null; return null;
} }
} }

2
src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs
View File

@@ -62,7 +62,7 @@ namespace Orchard.Core.Feeds.StandardQueries {
var items = _contentManager.Query() var items = _contentManager.Query()
.Where<CommonPartRecord>(x => x.Container == container.Record) .Where<CommonPartRecord>(x => x.Container == container.Record)
.OrderByDescending(x => x.PublishedUtc) .OrderByDescending(x => x.CreatedUtc)
.Slice(0, limit); .Slice(0, limit);
foreach (var item in items) { foreach (var item in items) {

32
src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs
View File

@@ -216,10 +216,24 @@ namespace Orchard.Blogs.Services {
_contentManager.Create(blogPost, VersionOptions.Draft); _contentManager.Create(blogPost, VersionOptions.Draft);
var publishedUtc = content.Optional<DateTime?>("dateCreated"); // try to get the UTC timezone by default
var publishedUtc = content.Optional<DateTime?>("date_created_gmt");
if (publishedUtc == null) {
// take the local one
publishedUtc = content.Optional<DateTime?>("dateCreated");
}
else {
// ensure it's read as a UTC time
publishedUtc = new DateTime(publishedUtc.Value.Ticks, DateTimeKind.Utc);
}
if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow)) if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow))
_blogPostService.Publish(blogPost); _blogPostService.Publish(blogPost);
if (publishedUtc != null) {
blogPost.As<CommonPart>().CreatedUtc = publishedUtc;
}
foreach (var driver in drivers) foreach (var driver in drivers)
driver.Process(blogPost.Id); driver.Process(blogPost.Id);
@@ -281,10 +295,24 @@ namespace Orchard.Blogs.Services {
blogPost.As<RoutePart>().Path = blogPost.As<RoutePart>().GetPathWithSlug(blogPost.As<RoutePart>().Slug); blogPost.As<RoutePart>().Path = blogPost.As<RoutePart>().GetPathWithSlug(blogPost.As<RoutePart>().Slug);
} }
var publishedUtc = content.Optional<DateTime?>("dateCreated"); // try to get the UTC timezone by default
var publishedUtc = content.Optional<DateTime?>("date_created_gmt");
if (publishedUtc == null) {
// take the local one
publishedUtc = content.Optional<DateTime?>("dateCreated");
}
else {
// ensure it's read as a UTC time
publishedUtc = new DateTime(publishedUtc.Value.Ticks, DateTimeKind.Utc);
}
if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow)) if (publish && (publishedUtc == null || publishedUtc <= DateTime.UtcNow))
_blogPostService.Publish(blogPost); _blogPostService.Publish(blogPost);
if (publishedUtc != null) {
blogPost.As<CommonPart>().CreatedUtc = publishedUtc;
}
foreach (var driver in drivers) foreach (var driver in drivers)
driver.Process(blogPost.Id); driver.Process(blogPost.Id);