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

Merge remote-tracking branch 'origin/dev-v7' into temp-U4-265

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
This commit is contained in:
Shannon
2016-05-25 09:51:46 +02:00
parent 2504586c26 7f3f11ab58
commit f243133b95
36 changed files with 304 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
View File

@@ -179,7 +179,7 @@ namespace Umbraco.Web.Models.Mapping
Label = localizedText.Localize("content/releaseDate"),
Value = display.ReleaseDate.HasValue ? display.ReleaseDate.Value.ToIsoString() : null,
//Not editible for people without publish permission (U4-287)
View = display.AllowedActions.Contains('P') ? "datepicker" : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View,
View = display.AllowedActions.Contains(ActionPublish.Instance.Letter) ? "datepicker" : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View
Config = new Dictionary<string, object>
{
{"offsetTime", "1"}
@@ -192,7 +192,7 @@ namespace Umbraco.Web.Models.Mapping
Label = localizedText.Localize("content/unpublishDate"),
Value = display.ExpireDate.HasValue ? display.ExpireDate.Value.ToIsoString() : null,
//Not editible for people without publish permission (U4-287)
View = display.AllowedActions.Contains('P') ? "datepicker" : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View,
View = display.AllowedActions.Contains(ActionPublish.Instance.Letter) ? "datepicker" : PropertyEditorResolver.Current.GetByAlias(Constants.PropertyEditors.NoEditAlias).ValueEditor.View
Config = new Dictionary<string, object>
{
{"offsetTime", "1"}