Merge branch 'Phosworks-U4-8530' into temp-U4-8530

This commit is contained in:
Shannon
2016-08-04 18:09:00 +02:00
2 changed files with 10 additions and 2 deletions

View File

@@ -58,7 +58,7 @@
</umb-button>
<umb-button
ng-if="!page.isNew"
ng-if="!page.isNew && content.preview"
type="button"
action="preview(content)"
label="Preview page"

View File

@@ -20,6 +20,11 @@ namespace Umbraco.Web.Models.ContentEditing
[DataContract(Name = "content", Namespace = "")]
public class ContentItemDisplay : ListViewAwareContentItemDisplayBase<ContentPropertyDisplay, IContent>
{
public ContentItemDisplay()
{
Preview = true;
}
[DataMember(Name = "publishDate")]
public DateTime? PublishDate { get; set; }
@@ -34,7 +39,10 @@ namespace Umbraco.Web.Models.ContentEditing
[DataMember(Name = "urls")]
public string[] Urls { get; set; }
[DataMember( Name = "preview" )]
public bool Preview { get; set; }
/// <summary>
/// The allowed 'actions' based on the user's permissions - Create, Update, Publish, Send to publish
/// </summary>