lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Corrected none null asumptions when altering exiting Content Types with new Parts

Browse Source 
--HG--
branch : dev
This commit is contained in:
Sebastien Ros 2010-07-19 11:50:13 -07:00
parent 9301e9eb0a
commit 3bf8517cb2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Core/PublishLater/ViewModels/PublishLaterViewModel.cs
View File

@ -33,7 +33,7 @@ namespace Orchard.Core.PublishLater.ViewModels {
get { return IsPublished || ContentItem.ContentManager.Get(ContentItem.Id, VersionOptions.Published) != null; }
}
public DateTime? VersionPublishedUtc { get { return ContentItem.As<CommonAspect>().VersionPublishedUtc; } }
public DateTime? VersionPublishedUtc { get { return ContentItem.As<CommonAspect>() == null ? null : ContentItem.As<CommonAspect>().VersionPublishedUtc; } }
public DateTime? ScheduledPublishUtc { get; set; }

4
src/Orchard.Web/Core/Routable/Services/RoutableService.cs
View File

@ -63,10 +63,10 @@ namespace Orchard.Core.Routable.Services {
public IEnumerable<IsRoutable> GetSimilarSlugs(string contentType, string slug)
{
return
_contentManager.Query(contentType).Join<RoutableRecord>()
_contentManager.Query().Join<RoutableRecord>()
.List()
.Select(i => i.As<IsRoutable>())
.Where(routable => routable.Path.Equals(slug, StringComparison.OrdinalIgnoreCase)) // todo: for some reason the filter doesn't work within the query, even without StringComparison or StartsWith
.Where(routable => routable.Path != null && routable.Path.Equals(slug, StringComparison.OrdinalIgnoreCase)) // todo: for some reason the filter doesn't work within the query, even without StringComparison or StartsWith
.ToArray();
}