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

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2013-09-20 09:58:24 +10:00
parent 3d3ea12aba 9c19f161dc
commit 6a343ef2b6
13 changed files with 217 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Core/Constants-PropertyEditors.cs
View File

@@ -157,6 +157,18 @@ namespace Umbraco.Core
/// </summary>
public const string IntegerAlias = "Umbraco.Integer";
/// <summary>
/// Alias for the listview datatype.
/// </summary>
public const string ListViewAlias = "Umbraco.ListView";
/// <summary>
/// Guid for the list view datatype.
/// </summary>
[Obsolete("GUIDs are no longer used to reference Property Editors, use the Alias constant instead. This will be removed in future versions")]
public const string ListView = "474FCFF8-9D2D-12DE-ABC6-AD7A56D89593";
/// <summary>
/// Guid for the Macro Container datatype.
/// </summary>

1
src/Umbraco.Core/PropertyEditors/LegacyPropertyEditorIdToAliasConverter.cs
View File

@@ -99,6 +99,7 @@ namespace Umbraco.Core.PropertyEditors
CreateMap(Guid.Parse(Constants.PropertyEditors.FolderBrowser), Constants.PropertyEditors.FolderBrowserAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.ImageCropper), Constants.PropertyEditors.ImageCropperAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.Integer), Constants.PropertyEditors.IntegerAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.ListView), Constants.PropertyEditors.ListViewAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.MacroContainer), Constants.PropertyEditors.MacroContainerAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.MediaPicker), Constants.PropertyEditors.MediaPickerAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.MemberPicker), Constants.PropertyEditors.MemberPickerAlias);