yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manually merges in publishing messaging when publishing something that has an expire date

Browse Source
This commit is contained in:
Shannon
2018-12-07 12:49:20 +11:00
parent 219a236069
commit 9b3de7b655
5 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Models/ContentScheduleCollection.cs
View File

@@ -169,6 +169,7 @@ namespace Umbraco.Core.Models
/// Gets the schedule for a culture
/// </summary>
/// <param name="culture"></param>
/// <param name="action"></param>
/// <returns></returns>
public IEnumerable<ContentSchedule> GetSchedule(string culture, ContentScheduleAction? action = null)
{

1
src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
View File

@@ -1004,7 +1004,6 @@ Mange hilsner fra Umbraco robotten
<key alias="editContentPublishedWithExpireDateText">og nu synligt for besøgende indtil {0}</key>
<key alias="editContentSavedHeader">Indhold gemt</key>
<key alias="editContentSavedText">Husk at publicere for at gøre det synligt for besøgende</key>
<key alias="editContentSavedWithReleaseDateText">Ændringerne bliver publiceret den {0}</key>
<key alias="editContentSendToPublish">Send til Godkendelse</key>
<key alias="editContentSendToPublishText">Rettelser er blevet sendt til godkendelse</key>
<key alias="editMediaSaved">Medie gemt</key>

1
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -1280,7 +1280,6 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="editContentPublishedWithExpireDateText">and visible on the website until {0}</key>
<key alias="editContentSavedHeader">Content saved</key>
<key alias="editContentSavedText">Remember to publish to make changes visible</key>
<key alias="editContentSavedWithReleaseDateText">Changes will be published on {0}</key>
<key alias="editContentSendToPublish">Sent For Approval</key>
<key alias="editContentSendToPublishText">Changes have been sent for approval</key>
<key alias="editMediaSaved">Media saved</key>

4
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -1295,13 +1295,13 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="dictionaryItemSaved">Dictionary item saved</key>
<key alias="editContentPublishedHeader">Content published</key>
<key alias="editContentPublishedText">and is visible on the website</key>
<key alias="editContentPublishedWithExpireDateText">and visible on the website until {0}</key>
<key alias="editContentPublishedWithExpireDateText">and visible on the website until %0%</key>
<key alias="editMultiContentPublishedText">%0% documents published and visible on the website</key>
<key alias="editVariantPublishedText">%0% published and visible on the website</key>
<key alias="editVariantPublishedTextWithExpireDateText">%0% published and visible on the website until %1%</key>
<key alias="editMultiVariantPublishedText">%0% documents published for languages %1% and visible on the website</key>
<key alias="editContentSavedHeader">Content saved</key>
<key alias="editContentSavedText">Remember to publish to make changes visible</key>
<key alias="editContentSavedWithReleaseDateText">Changes will be published on {0}</key>
<key alias="editContentScheduledSavedText">A schedule for publishing has been updated</key>
<key alias="editVariantSavedText">%0% saved</key>
<key alias="editContentSendToPublish">Sent For Approval</key>

67
src/Umbraco.Web/Editors/ContentController.cs
View File

@@ -739,11 +739,12 @@ namespace Umbraco.Web.Editors
case ContentSaveAction.PublishNew:
{
var publishStatus = PublishInternal(contentItem, out wasCancelled, out var successfulCultures);
//global notifications
AddMessageForPublishStatus(new[] { publishStatus }, globalNotifications, successfulCultures);
AddMessageForPublishStatus(new[] { publishStatus }, globalNotifications, successfulCultures, contentItem.PersistedContent.ContentSchedule);
//variant specific notifications
foreach (var c in successfulCultures)
AddMessageForPublishStatus(new[] { publishStatus }, notifications.GetOrCreate(c), successfulCultures);
AddMessageForPublishStatus(new[] { publishStatus }, notifications.GetOrCreate(c), successfulCultures, contentItem.PersistedContent.ContentSchedule);
}
break;
case ContentSaveAction.PublishWithDescendants:
@@ -1153,7 +1154,6 @@ namespace Umbraco.Web.Editors
/// Performs the publishing operation for a content item
/// </summary>
/// <param name="contentItem"></param>
/// <param name="publishStatus"></param>
/// <param name="wasCancelled"></param>
/// <param name="successfulCultures">
/// if the content is variant this will return an array of cultures that will be published (passed validation rules)
@@ -1863,12 +1863,13 @@ namespace Umbraco.Web.Editors
/// <summary>
/// Adds notification messages to the outbound display model for a given published status
/// </summary>
/// <param name="status"></param>
/// <param name="statuses"></param>
/// <param name="display"></param>
/// <param name="successfulCultures">
/// This is null when dealing with invariant content, else it's the cultures that were succesfully published
/// This is null when dealing with invariant content, else it's the cultures that were succesfully published
/// </param>
private void AddMessageForPublishStatus(IEnumerable<PublishResult> statuses, INotificationModel display, string[] successfulCultures = null)
/// <param name="contentSchedule"></param>
private void AddMessageForPublishStatus(IEnumerable<PublishResult> statuses, INotificationModel display, string[] successfulCultures = null, ContentScheduleCollection contentSchedule = null)
{
var totalStatusCount = statuses.Count();
@@ -1914,21 +1915,57 @@ namespace Umbraco.Web.Editors
var itemCount = status.Count();
if (totalStatusCount == 1 || totalStatusCount == itemCount)
{
//inline method to output the messages for variants
void AddNotificationForVariants(IEnumerable<string> cultures, ContentSchedule[] expire)
{
foreach (var c in cultures)
{
var expires = expire.FirstOrDefault(x => x.Culture.InvariantEquals(c));
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
expires == null
? Services.TextService.Localize("speechBubbles/editVariantPublishedText", new[] {_allLangs.Value[c].CultureName})
: Services.TextService.Localize("speechBubbles/editVariantPublishedTextWithExpireDateText", new[]
{
_allLangs.Value[c].CultureName,
$"{expires.Date.ToLongDateString()} {expires.Date:HH:mm}"
}));
}
}
//check the content schedule and get the release dates for all cultures (and use string.Empty if invariant)
var expireDates = contentSchedule == null
? Array.Empty<ContentSchedule>()
: (successfulCultures == null || successfulCultures.Length == 0 ? new[] { string.Empty } : successfulCultures)
.SelectMany(x => contentSchedule.GetSchedule(x, ContentScheduleAction.Expire)).ToArray();
if (successfulCultures == null || totalStatusCount == itemCount)
{
//either invariant single publish, or bulk publish where all statuses are already published
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
Services.TextService.Localize("speechBubbles/editContentPublishedText"));
if (expireDates.Length == 0)
{
//normal status, no release dates
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
Services.TextService.Localize("speechBubbles/editContentPublishedText"));
}
else if (successfulCultures == null)
{
//this is invariant with a release date
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
Services.TextService.Localize("speechBubbles/editContentPublishedWithExpireDateText", new[] {$"{expireDates[0].Date.ToLongDateString()} {expireDates[0].Date:HH:mm}"}));
}
else
{
//this is variant with release dates
AddNotificationForVariants(successfulCultures, expireDates);
}
}
else
{
foreach (var c in successfulCultures)
{
display.AddSuccessNotification(
Services.TextService.Localize("speechBubbles/editContentPublishedHeader"),
Services.TextService.Localize("speechBubbles/editVariantPublishedText", new[] { _allLangs.Value[c].CultureName }));
}
AddNotificationForVariants(successfulCultures, expireDates);
}
}
}