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
This commit is contained in:
Shannon
2013-09-18 10:49:18 +10:00
parent 544bb4eb81 526f2f2e81
commit 3e03fea1ae
72 changed files with 1139 additions and 906 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -361,11 +361,23 @@ namespace Umbraco.Core
[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 UploadField = "5032A6E6-69E3-491D-BB28-CD31CD11086C";
/// <summary>
/// Alias for the User picker datatype.
/// </summary>
public const string UserPickerAlias = "Umbraco.UserPicker";
/// <summary>
/// Guid for the User picker 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 UserPicker = "e66af4a0-e8b4-11de-8a39-0800200c9a66";
/// <summary>
/// Alias for the Upload field datatype.
/// </summary>
public const string UploadFieldAlias = "Umbraco.UploadField";
/// <summary>
/// Guid for the XPath CheckBoxList datatype.
/// </summary>

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

@@ -116,6 +116,7 @@ namespace Umbraco.Core.PropertyEditors
CreateMap(Guid.Parse(Constants.PropertyEditors.TinyMCEv3), Constants.PropertyEditors.TinyMCEv3Alias);
CreateMap(Guid.Parse(Constants.PropertyEditors.TrueFalse), Constants.PropertyEditors.TrueFalseAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UltimatePicker), Constants.PropertyEditors.UltimatePickerAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UserPicker), Constants.PropertyEditors.UserPickerAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UltraSimpleEditor), Constants.PropertyEditors.UltraSimpleEditorAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UmbracoUserControlWrapper), Constants.PropertyEditors.UmbracoUserControlWrapperAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UploadField), Constants.PropertyEditors.UploadFieldAlias);