From 379661e3026e4cb914dd8effe65512b5ce3e3afb Mon Sep 17 00:00:00 2001
From: Marc Goodson <marc@snowmoon.co.uk>
Date: Mon, 25 Jul 2016 09:17:27 +0100
Subject: [PATCH] Fixes  U4-8772, adds HasPublishedVersion property to mapping
 of IContent to ContentItemBasic, then adds existing 'has-unpublished-version'
 css class to list view row if item is published but has unpublished changes

---
 src/Umbraco.Web.UI.Client/src/views/components/umb-table.html | 2 +-
 src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs     | 3 +++
 src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs          | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
index fb5e992d81..9b60e5e92f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
@@ -36,7 +36,7 @@
                 }"
                  ng-click="selectItem(item, $index, $event)">
 
-                <div class="umb-table-cell">
+                <div class="umb-table-cell" ng-class="{'has-unpublished-version':!item.published && item.hasPublishedVersion}">
                     <i class="umb-table-body__icon umb-table-body__fileicon {{item.icon}}" ng-class="getIcon(item)"></i>
                     <i class="umb-table-body__icon umb-table-body__checkicon icon-check"></i>
                 </div>
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs
index 63a9d849d9..87eff89b58 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemBasic.cs
@@ -25,6 +25,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "published")]
         public bool Published { get; set; }
 
+        [DataMember(Name = "hasPublishedVersion")]
+        public bool HasPublishedVersion { get; set; }
+
         [DataMember(Name = "owner")]
         public UserBasic Owner { get; set; }
 
diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index 125099dd29..5fc642873b 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -87,6 +87,9 @@ namespace Umbraco.Web.Models.Mapping
                 .ForMember(
                     dto => dto.Trashed,
                     expression => expression.MapFrom(content => content.Trashed))
+                    .ForMember(
+                    dto => dto.HasPublishedVersion,
+                    expression => expression.MapFrom(content => content.HasPublishedVersion))
                 .ForMember(
                     dto => dto.ContentTypeAlias,
                     expression => expression.MapFrom(content => content.ContentType.Alias))