From fdfdd541e3389de9d58211d8da55603ea2f6d1c6 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 5 Jul 2018 17:14:11 +0200 Subject: [PATCH] Content Url and Audit (in progress) --- .../Services/Implement/ContentService.cs | 46 ++-- .../Services/UnpublishResultType.cs | 2 +- .../content/umb-content-node-info.html | 57 ++--- .../components/media/umb-media-node-info.html | 10 +- src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 2 + .../Umbraco/config/lang/en_us.xml | 2 + src/Umbraco.Web/Editors/ContentController.cs | 5 +- .../ContentEditing/ContentItemDisplay.cs | 3 +- .../Models/Mapping/ContentUrlResolver.cs | 6 +- src/Umbraco.Web/Routing/UrlInfo.cs | 50 ++++ .../Routing/UrlProviderExtensions.cs | 226 ++++++++++-------- src/Umbraco.Web/Umbraco.Web.csproj | 1 + 12 files changed, 250 insertions(+), 160 deletions(-) create mode 100644 src/Umbraco.Web/Routing/UrlInfo.cs diff --git a/src/Umbraco.Core/Services/Implement/ContentService.cs b/src/Umbraco.Core/Services/Implement/ContentService.cs index 731f29ed4e..e953a6073e 100644 --- a/src/Umbraco.Core/Services/Implement/ContentService.cs +++ b/src/Umbraco.Core/Services/Implement/ContentService.cs @@ -891,7 +891,7 @@ namespace Umbraco.Core.Services.Implement } var changeType = TreeChangeTypes.RefreshNode; scope.Events.Dispatch(TreeChanged, this, new TreeChange(content, changeType).ToEventArgs()); - Audit(AuditType.Save, "Save Content performed by user", userId, content.Id); + Audit(AuditType.Save, "Saved by user", userId, content.Id); scope.Complete(); } @@ -931,7 +931,7 @@ namespace Umbraco.Core.Services.Implement scope.Events.Dispatch(Saved, this, saveEventArgs, "Saved"); } scope.Events.Dispatch(TreeChanged, this, treeChanges.ToEventArgs()); - Audit(AuditType.Save, "Bulk Save content performed by user", userId == -1 ? 0 : userId, Constants.System.Root); + Audit(AuditType.Save, "Bulk-saved by user", userId == -1 ? 0 : userId, Constants.System.Root); scope.Complete(); } @@ -988,6 +988,8 @@ namespace Umbraco.Core.Services.Implement { var evtMsgs = EventMessagesFactory.Get(); + culture = culture.NullOrWhiteSpaceAsNull(); + var publishedState = content.PublishedState; if (publishedState != PublishedState.Published && publishedState != PublishedState.Unpublished) throw new InvalidOperationException($"Cannot save-and-publish (un)publishing content, use the dedicated {nameof(SavePublishing)} method."); @@ -996,12 +998,12 @@ namespace Umbraco.Core.Services.Implement // cannot accept a specific culture for invariant content type (but '*' is ok) if (content.ContentType.VariesByCulture()) { - if (culture.IsNullOrWhiteSpace()) + if (culture == null) throw new NotSupportedException("Invariant culture is not supported by variant content types."); } else { - if (!culture.IsNullOrWhiteSpace() && culture != "*") + if (culture != null && culture != "*") throw new NotSupportedException($"Culture \"{culture}\" is not supported by invariant content types."); } @@ -1010,7 +1012,7 @@ namespace Umbraco.Core.Services.Implement return new UnpublishResult(UnpublishResultType.SuccessAlready, evtMsgs, content); // all cultures = unpublish whole - if (culture == "*") + if (culture == "*" || (!content.ContentType.VariesByCulture() && culture == null)) { ((Content) content).PublishedState = PublishedState.Unpublishing; } @@ -1031,9 +1033,21 @@ namespace Umbraco.Core.Services.Implement var saved = SavePublishing(content, userId); if (saved.Success) { - Audit(AuditType.UnPublish, $"Unpublish variation culture: \"{culture ?? string.Empty}\" performed by user", userId, content.Id); + UnpublishResultType result; + if (culture == "*" || culture == null) + { + Audit(AuditType.UnPublish, "Unpublished by user", userId, content.Id); + result = UnpublishResultType.Success; + } + else + { + Audit(AuditType.UnPublish, $"Culture \"{culture}\" unpublished by user", userId, content.Id); + if (!content.Published) + Audit(AuditType.UnPublish, $"Unpublished (culture \"{culture}\" is mandatory) by user", userId, content.Id); + result = content.Published ? UnpublishResultType.SuccessCulture : UnpublishResultType.SuccessMandatoryCulture; + } scope.Complete(); - return new UnpublishResult(UnpublishResultType.SuccessVariant, evtMsgs, content); + return new UnpublishResult(result, evtMsgs, content); } // failed - map result @@ -1156,7 +1170,7 @@ namespace Umbraco.Core.Services.Implement // events and audit scope.Events.Dispatch(UnPublished, this, new PublishEventArgs(content, false, false), "UnPublished"); scope.Events.Dispatch(TreeChanged, this, new TreeChange(content, TreeChangeTypes.RefreshBranch).ToEventArgs()); - Audit(AuditType.UnPublish, "UnPublish performed by user", userId, content.Id); + Audit(AuditType.UnPublish, "Unpublished by user", userId, content.Id); scope.Complete(); return new PublishResult(PublishResultType.Success, evtMsgs, content); } @@ -1187,7 +1201,7 @@ namespace Umbraco.Core.Services.Implement scope.Events.Dispatch(Published, this, new PublishEventArgs(descendants, false, false), "Published"); } - Audit(AuditType.Publish, "Save and Publish performed by user", userId, content.Id); + Audit(AuditType.Publish, "Published by user", userId, content.Id); scope.Complete(); return publishResult; } @@ -1321,7 +1335,7 @@ namespace Umbraco.Core.Services.Implement scope.Events.Dispatch(TreeChanged, this, new TreeChange(document, TreeChangeTypes.RefreshBranch).ToEventArgs()); scope.Events.Dispatch(Published, this, new PublishEventArgs(publishedDocuments, false, false), "Published"); - Audit(AuditType.Publish, "SaveAndPublishBranch performed by user", userId, document.Id); + Audit(AuditType.Publish, "Branch published by user", userId, document.Id); scope.Complete(); } @@ -1390,7 +1404,7 @@ namespace Umbraco.Core.Services.Implement DeleteLocked(scope, content); scope.Events.Dispatch(TreeChanged, this, new TreeChange(content, TreeChangeTypes.Remove).ToEventArgs()); - Audit(AuditType.Delete, "Delete Content performed by user", userId, content.Id); + Audit(AuditType.Delete, "Deleted by user", userId, content.Id); scope.Complete(); } @@ -1458,7 +1472,7 @@ namespace Umbraco.Core.Services.Implement deleteRevisionsEventArgs.CanCancel = false; scope.Events.Dispatch(DeletedVersions, this, deleteRevisionsEventArgs); - Audit(AuditType.Delete, "Delete Content by version date performed by user", userId, Constants.System.Root); + Audit(AuditType.Delete, "Delete (by version date) by user", userId, Constants.System.Root); scope.Complete(); } @@ -1495,7 +1509,7 @@ namespace Umbraco.Core.Services.Implement _documentRepository.DeleteVersion(versionId); scope.Events.Dispatch(DeletedVersions, this, new DeleteRevisionsEventArgs(id, false,/* specificVersion:*/ versionId)); - Audit(AuditType.Delete, "Delete Content by version performed by user", userId, Constants.System.Root); + Audit(AuditType.Delete, "Delete (by version) by user", userId, Constants.System.Root); scope.Complete(); } @@ -1540,7 +1554,7 @@ namespace Umbraco.Core.Services.Implement moveEventArgs.CanCancel = false; moveEventArgs.MoveInfoCollection = moveInfo; scope.Events.Dispatch(Trashed, this, moveEventArgs, nameof(Trashed)); - Audit(AuditType.Move, "Move Content to Recycle Bin performed by user", userId, content.Id); + Audit(AuditType.Move, "Moved to Recycle Bin by user", userId, content.Id); scope.Complete(); } @@ -1612,7 +1626,7 @@ namespace Umbraco.Core.Services.Implement moveEventArgs.MoveInfoCollection = moveInfo; moveEventArgs.CanCancel = false; scope.Events.Dispatch(Moved, this, moveEventArgs, nameof(Moved)); - Audit(AuditType.Move, "Move Content performed by user", userId, content.Id); + Audit(AuditType.Move, "Moved by user", userId, content.Id); scope.Complete(); } @@ -1709,7 +1723,7 @@ namespace Umbraco.Core.Services.Implement recycleBinEventArgs.RecycleBinEmptiedSuccessfully = true; // oh my?! scope.Events.Dispatch(EmptiedRecycleBin, this, recycleBinEventArgs); scope.Events.Dispatch(TreeChanged, this, deleted.Select(x => new TreeChange(x, TreeChangeTypes.Remove)).ToEventArgs()); - Audit(AuditType.Delete, "Empty Content Recycle Bin performed by user", 0, Constants.System.RecycleBinContent); + Audit(AuditType.Delete, "Recycle Bin emptied by user", 0, Constants.System.RecycleBinContent); scope.Complete(); } diff --git a/src/Umbraco.Core/Services/UnpublishResultType.cs b/src/Umbraco.Core/Services/UnpublishResultType.cs index 010c37d7a5..e61e786a05 100644 --- a/src/Umbraco.Core/Services/UnpublishResultType.cs +++ b/src/Umbraco.Core/Services/UnpublishResultType.cs @@ -18,7 +18,7 @@ /// /// The specified variant was unpublished, the content item itself remains published. /// - SuccessVariant = 2, + SuccessCulture = 2, /// /// The specified variant was a mandatory culture therefore it was unpublished and the content item itself is unpublished diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index b33e27d048..c9e4af4062 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -1,19 +1,22 @@
- +
- + @@ -23,12 +26,12 @@ - +
- +
-
- +
+
- +
{{item.timestampFormatted}}
- +
{{ item.comment }}
- +
@@ -84,8 +87,8 @@
- - + +
@@ -96,15 +99,15 @@
- + - +
- +
@@ -115,12 +118,12 @@
{{node.releaseDateDay}} {{node.releaseDateTime}}
- Set date - + Set date +
- + Clear date @@ -140,7 +143,7 @@
- +
{{node.removeDateMonth}} {{node.removeDateYear}}
{{node.removeDateDayNumber}}
@@ -159,7 +162,7 @@
- + @@ -200,7 +203,7 @@ {{ node.key }} - +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html index 9f4043db39..9d060090ec 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html @@ -5,16 +5,16 @@ -
    + @@ -56,4 +56,4 @@ - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 450b33d816..568b5ac693 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -165,9 +165,11 @@ This media item has no link Properties This document is published but is not visible because the parent '%0%' is unpublished + This culture is published but is not visible because it is unpublished on parent '%0%' This document is published but is not in the cache Could not get the url This document is published but its url would collide with content %0% + This document is published but its url cannot be routed Publish Published Published (pending changes) diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 711280ea4c..1c2447cbb6 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -199,9 +199,11 @@ This media item has no link Properties This document is published but is not visible because the parent '%0%' is unpublished + This culture is published but is not visible because it is unpublished on parent '%0%' This document is published but is not in the cache Could not get the url This document is published but its url would collide with content %0% + This document is published but its url cannot be routed Publish Published Published (pending changes) diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index 0033a97bce..b8dcb9e8fa 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -1003,7 +1003,7 @@ namespace Umbraco.Web.Editors if (foundContent == null) HandleContentNotFound(id); - + var unpublishResult = Services.ContentService.Unpublish(foundContent, culture: culture, userId: Security.GetUserId().ResultOr(0)); var content = MapToDisplay(foundContent, culture); @@ -1019,7 +1019,7 @@ namespace Umbraco.Web.Editors content.AddSuccessNotification( Services.TextService.Localize("content/unPublish"), - unpublishResult.Result == UnpublishResultType.SuccessVariant + unpublishResult.Result == UnpublishResultType.SuccessCulture ? Services.TextService.Localize("speechBubbles/contentVariationUnpublished", new[] { culture }) : Services.TextService.Localize("speechBubbles/contentUnpublished")); @@ -1288,6 +1288,5 @@ namespace Umbraco.Web.Editors return display; } - } } diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs index 751b53cf5c..08b95a9029 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Runtime.Serialization; using Umbraco.Core.Models; +using Umbraco.Web.Routing; namespace Umbraco.Web.Models.ContentEditing { @@ -41,7 +42,7 @@ namespace Umbraco.Web.Models.ContentEditing public ContentTypeBasic DocumentType { get; set; } [DataMember(Name = "urls")] - public string[] Urls { get; set; } + public UrlInfo[] Urls { get; set; } /// /// Determines whether previewing is allowed for this node diff --git a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs index e311190d67..a278a4a8c5 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentUrlResolver.cs @@ -8,7 +8,7 @@ using Umbraco.Web.Routing; namespace Umbraco.Web.Models.Mapping { - internal class ContentUrlResolver : IValueResolver + internal class ContentUrlResolver : IValueResolver { private readonly ILocalizedTextService _textService; private readonly IContentService _contentService; @@ -21,12 +21,12 @@ namespace Umbraco.Web.Models.Mapping _logger = logger; } - public string[] Resolve(IContent source, ContentItemDisplay destination, string[] destMember, ResolutionContext context) + public UrlInfo[] Resolve(IContent source, ContentItemDisplay destination, UrlInfo[] destMember, ResolutionContext context) { var umbracoContext = context.GetUmbracoContext(throwIfMissing: false); var urls = umbracoContext == null - ? new[] {"Cannot generate urls without a current Umbraco Context"} + ? new[] { UrlInfo.Message("Cannot generate urls without a current Umbraco Context") } : source.GetContentUrls(umbracoContext.UrlProvider, _textService, _contentService, _logger).ToArray(); return urls; diff --git a/src/Umbraco.Web/Routing/UrlInfo.cs b/src/Umbraco.Web/Routing/UrlInfo.cs new file mode 100644 index 0000000000..cd77bb7006 --- /dev/null +++ b/src/Umbraco.Web/Routing/UrlInfo.cs @@ -0,0 +1,50 @@ +using System.Runtime.Serialization; + +namespace Umbraco.Web.Routing +{ + /// + /// Represents infos for a url. + /// + [DataContract(Name = "urlInfo", Namespace = "")] + public class UrlInfo + { + /// + /// Initializes a new instance of the class. + /// + private UrlInfo(string text, bool isUrl, string culture) + { + IsUrl = isUrl; + Text = text; + Culture = culture; + } + + /// + /// Gets the culture. + /// + [DataMember(Name = "culture")] + public string Culture { get; } + + /// + /// Gets a value indicating whether the url is a true url. + /// + /// Otherwise, it is a message. + [DataMember(Name = "isUrl")] + public bool IsUrl { get; } + + /// + /// Gets the text, which is either the url, or a message. + /// + [DataMember(Name = "text")] + public string Text { get; } + + /// + /// Creates a instance representing a true url. + /// + public static UrlInfo Url(string text, string culture = null) => new UrlInfo(text, true, culture); + + /// + /// Creates a instance representing a message. + /// + public static UrlInfo Message(string text, string culture = null) => new UrlInfo(text, false, culture); + } +} diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs index b7e26f894e..797c943452 100644 --- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using System.Threading; +using System.Linq; using Umbraco.Core.Models; using Umbraco.Core.Services; using Umbraco.Core; @@ -18,7 +18,7 @@ namespace Umbraco.Web.Routing /// Use when displaying Urls. If errors occur when generating the Urls, they will show in the list. /// Contains all the Urls that we can figure out (based upon domains, etc). /// - public static IEnumerable GetContentUrls(this IContent content, UrlProvider urlProvider, ILocalizedTextService textService, IContentService contentService, ILogger logger) + public static IEnumerable GetContentUrls(this IContent content, UrlProvider urlProvider, ILocalizedTextService textService, IContentService contentService, ILogger logger) { if (content == null) throw new ArgumentNullException(nameof(content)); if (urlProvider == null) throw new ArgumentNullException(nameof(urlProvider)); @@ -26,50 +26,39 @@ namespace Umbraco.Web.Routing if (contentService == null) throw new ArgumentNullException(nameof(contentService)); if (logger == null) throw new ArgumentNullException(nameof(logger)); - var urls = new HashSet(); - - // going to build a list of urls (essentially for the back-office) - // which will contain - // - the 'main' url, which is what .Url would return, in the current culture - // - the 'other' urls we know (based upon domains, etc) - // - // this essentially happens when producing the urls for the back-office, and then we don't have - // a meaningful 'current culture' - so we need to explicitely pass some culture where required, - // and deal with whatever might happen - // - // if content is variant, go with the current culture - and that is NOT safe, there may be - // no 'main' url for that culture, deal with it later - otherwise, go with the invariant - // culture, and that is safe. - var varies = content.ContentType.VariesByCulture(); - var culture = varies ? Thread.CurrentThread.CurrentUICulture.Name : ""; + var urls = new List(); if (content.Published == false) { - urls.Add(textService.Localize("content/itemNotPublished")); + urls.Add(UrlInfo.Message(textService.Localize("content/itemNotPublished"))); return urls; } - string url = null; + // fixme inject + // fixme PublishedRouter is stateless and should be a singleton! + var localizationService = Core.Composing.Current.Services.LocalizationService; + var publishedRouter = Core.Composing.Current.Container.GetInstance(); - if (varies) - { - if (!content.IsCulturePublished(culture)) - { - urls.Add(textService.Localize("content/itemCultureNotPublished", culture)); - // but keep going, we want to add the 'other' urls - url = "#no"; - } - else if (!content.IsCultureAvailable(culture)) - { - urls.Add(textService.Localize("content/itemCultureNotAvailable", culture)); - // but keep going, we want to add the 'other' urls - url = "#no"; - } - } + // build a list of urls, for the back-office + // which will contain + // - the 'main' urls, which is what .Url would return, for each culture + // - the 'other' urls we know (based upon domains, etc) + // + // need to work on each culture. + // on invariant trees, each culture return the same thing + // but, we don't know if the tree to this content is invariant - // get the 'main' url - if (url == null) + var cultures = localizationService.GetAllLanguages().Select(x => x.IsoCode).ToList(); + + foreach (var culture in cultures) { + // if content is variant, and culture is not published, skip + if (content.ContentType.VariesByCulture() && !content.IsCulturePublished(culture)) + continue; + + // if it's variant and culture is published, or if it's invariant, proceed + + string url; try { url = urlProvider.GetUrl(content.Id, culture); @@ -79,79 +68,108 @@ namespace Umbraco.Web.Routing logger.Error("GetUrl exception.", e); url = "#ex"; } - } - if (url == "#") // deal with 'could not get the url' - { - // document as a published version yet its url is "#" => a parent must be - // unpublished, walk up the tree until we find it, and report. - var parent = content; - do + switch (url) { - parent = parent.ParentId > 0 ? parent.Parent(contentService) : null; - } - while (parent != null && parent.Published && (!varies || parent.IsCulturePublished(culture))); + // deal with 'could not get the url' + case "#": + HandleCouldNotGetUrl(content, culture, urls, contentService, textService); + break; - urls.Add(parent == null - ? textService.Localize("content/parentNotPublishedAnomaly") // oops - internal error - : textService.Localize("content/parentNotPublished", new[] { parent.Name })); - } - else if (url == "#ex") // deal with exceptions - { - urls.Add(textService.Localize("content/getUrlException")); - } - else if (url == "#no") // deal with 'there is no main url' - { - // get the 'other' urls - foreach(var otherUrl in urlProvider.GetOtherUrls(content.Id)) - urls.Add(otherUrl); - } - else // detect collisions, etc - { - // test for collisions on the 'main' url - var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute); - if (uri.IsAbsoluteUri == false) uri = uri.MakeAbsolute(UmbracoContext.Current.CleanedUmbracoUrl); - uri = UriUtility.UriToUmbraco(uri); - var r = Core.Composing.Current.Container.GetInstance(); // fixme inject or ? - var pcr = r.CreateRequest(UmbracoContext.Current, uri); - r.TryRouteRequest(pcr); + // deal with exceptions + case "#ex": + urls.Add(UrlInfo.Message(textService.Localize("content/getUrlException"), culture)); + break; - if (pcr.HasPublishedContent == false) - { - urls.Add(textService.Localize("content/routeError", new[] { "(error)" })); - } - else if (pcr.PublishedContent.Id != content.Id) - { - var o = pcr.PublishedContent; - string s; - if (o == null) - { - s = "(unknown)"; - } - else - { - var l = new List(); - while (o != null) - { - l.Add(o.Name); - o = o.Parent; - } - l.Reverse(); - s = "/" + string.Join("/", l) + " (id=" + pcr.PublishedContent.Id + ")"; - - } - urls.Add(textService.Localize("content/routeError", s)); - } - else - { - urls.Add(url); - - // get the 'other' urls - foreach(var otherUrl in urlProvider.GetOtherUrls(content.Id)) - urls.Add(otherUrl); + // got a url, deal with collisions, add url + default: + if (!DetectCollision(content, url, urls, culture, publishedRouter, textService)) // detect collisions, etc + urls.Add(UrlInfo.Url(url, culture)); + break; } } - return urls; + + // prepare for de-duplication + var durl = new Dictionary>(); + var dmsg = new Dictionary>(); + foreach (var url in urls) + { + var d = url.IsUrl ? durl : dmsg; + if (!d.TryGetValue(url.Text, out var l)) + d[url.Text] = l = new List(); + l.Add(url); + } + + // deduplicate, order urls first then messages, concatenate cultures (hide if 'all') + var ret = new List(); + foreach (var (text, infos) in durl) + ret.Add(UrlInfo.Url(text, infos.Count == cultures.Count ? null : string.Join(", ", infos.Select(x => x.Culture)))); + foreach (var (text, infos) in dmsg) + ret.Add(UrlInfo.Message(text, infos.Count == cultures.Count ? null : string.Join(", ", infos.Select(x => x.Culture)))); + + // fixme - need to add 'others' urls + // but, when? + //// get the 'other' urls + //foreach(var otherUrl in urlProvider.GetOtherUrls(content.Id)) + // urls.Add(otherUrl); + + return ret; + } + + private static void HandleCouldNotGetUrl(IContent content, string culture, List urls, IContentService contentService, ILocalizedTextService textService) + { + // document has a published version yet its url is "#" => a parent must be + // unpublished, walk up the tree until we find it, and report. + var parent = content; + do + { + parent = parent.ParentId > 0 ? parent.Parent(contentService) : null; + } + while (parent != null && parent.Published && (!parent.ContentType.VariesByCulture() || parent.IsCulturePublished(culture))); + + if (parent == null) // oops, internal error + urls.Add(UrlInfo.Message(textService.Localize("content/parentNotPublishedAnomaly"), culture)); + + else if (!parent.Published) // totally not published + urls.Add(UrlInfo.Message(textService.Localize("content/parentNotPublished", new[] { parent.Name }), culture)); + + else // culture not published + urls.Add(UrlInfo.Message(textService.Localize("content/parentCultureNotPublished", new[] { parent.Name }), culture)); + } + + private static bool DetectCollision(IContent content, string url, List urls, string culture, PublishedRouter publishedRouter, ILocalizedTextService textService) + { + // test for collisions on the 'main' url + var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute); + if (uri.IsAbsoluteUri == false) uri = uri.MakeAbsolute(UmbracoContext.Current.CleanedUmbracoUrl); + uri = UriUtility.UriToUmbraco(uri); + var pcr = publishedRouter.CreateRequest(UmbracoContext.Current, uri); + publishedRouter.TryRouteRequest(pcr); + + if (pcr.HasPublishedContent == false) + { + urls.Add(UrlInfo.Message(textService.Localize("content/routeErrorCannotRoute"), culture)); + return true; + } + + if (pcr.PublishedContent.Id != content.Id) + { + var o = pcr.PublishedContent; + var l = new List(); + while (o != null) + { + l.Add(o.Name); + o = o.Parent; + } + l.Reverse(); + var s = "/" + string.Join("/", l) + " (id=" + pcr.PublishedContent.Id + ")"; + + urls.Add(UrlInfo.Message(textService.Localize("content/routeError", s), culture)); + return true; + } + + // no collision + return false; } } } diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index f266213da0..b487168796 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -395,6 +395,7 @@ +