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

Fixes issue with IsEdited and state to make things consistent and easy

Browse Source
This commit is contained in:
Shannon
2018-08-08 16:29:07 +10:00
parent 69acaabec1
commit f921e891a3
13 changed files with 87 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Umbraco.Web/Models/Mapping/ContentItemDisplayVariationResolver.cs
View File

@@ -54,12 +54,23 @@ namespace Umbraco.Web.Models.Mapping
variant.Language = x;
variant.Name = source.GetCultureName(x.IsoCode);
variant.Exists = source.IsCultureAvailable(x.IsoCode); // segments ??
variant.PublishedState = (source.PublishedState == PublishedState.Unpublished //if the entire document is unpublished, then flag every variant as unpublished
var publishedState = source.PublishedState == PublishedState.Unpublished //if the entire document is unpublished, then flag every variant as unpublished
? PublishedState.Unpublished
: source.IsCulturePublished(x.IsoCode)
? PublishedState.Published
: PublishedState.Unpublished).ToString();
variant.IsEdited = source.IsCultureEdited(x.IsoCode);
: PublishedState.Unpublished;
var isEdited = source.Id > 0 && source.IsCultureEdited(x.IsoCode);
//now we can calculate the content state
if (!isEdited && publishedState == PublishedState.Unpublished)
variant.State = ContentSavedState.NotCreated;
else if (isEdited && publishedState == PublishedState.Unpublished)
variant.State = ContentSavedState.Draft;
else if (!isEdited && publishedState == PublishedState.Published)
variant.State = ContentSavedState.Published;
else
variant.State = ContentSavedState.PublishedPendingChanges;
}
return variants;