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

changes TinyMCEv3Alias to just TinyMCEAlias but unfortunatey we cannot change the actual alias stored in the db because we're already in RC - that means that people will forever see TinyMCEv3 as the property editor alias :( even though it is already v4

Browse Source
This commit is contained in:
Shannon
2013-11-14 13:39:03 +11:00
parent 6474b2b045
commit 8dab2148f1
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -319,9 +319,9 @@ namespace Umbraco.Core
public const string TinyMCEv3 = "5E9B75AE-FACE-41C8-B47E-5F4B0FD82F83";
/// <summary>
/// Alias for the TinyMCE v3 wysiwyg datatype.
/// Alias for the TinyMCE wysiwyg datatype.
/// </summary>
public const string TinyMCEv3Alias = "Umbraco.TinyMCEv3";
public const string TinyMCEAlias = "Umbraco.TinyMCEv3";
/// <summary>
/// Guid for the True/False (Ja/Nej) datatype.

2
src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
View File

@@ -213,7 +213,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
//TODO Check which of the DataTypeIds below doesn't exist in umbracoNode, which results in a foreign key constraint errors.
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 1, DataTypeId = -49, PropertyEditorAlias = Constants.PropertyEditors.TrueFalseAlias, DbType = "Integer" });
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 2, DataTypeId = -51, PropertyEditorAlias = Constants.PropertyEditors.IntegerAlias, DbType = "Integer" });
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 3, DataTypeId = -87, PropertyEditorAlias = Constants.PropertyEditors.TinyMCEv3Alias, DbType = "Ntext" });
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 3, DataTypeId = -87, PropertyEditorAlias = Constants.PropertyEditors.TinyMCEAlias, DbType = "Ntext" });
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 4, DataTypeId = -88, PropertyEditorAlias = Constants.PropertyEditors.TextboxAlias, DbType = "Nvarchar" });
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 5, DataTypeId = -89, PropertyEditorAlias = Constants.PropertyEditors.TextboxMultipleAlias, DbType = "Ntext" });
_database.Insert("cmsDataType", "pk", false, new DataTypeDto { PrimaryKey = 6, DataTypeId = -90, PropertyEditorAlias = Constants.PropertyEditors.UploadFieldAlias, DbType = "Nvarchar" });

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

@@ -128,7 +128,7 @@ namespace Umbraco.Core.PropertyEditors
CreateMap(Guid.Parse(Constants.PropertyEditors.Tags), Constants.PropertyEditors.TagsAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.Textbox), Constants.PropertyEditors.TextboxAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.TextboxMultiple), Constants.PropertyEditors.TextboxMultipleAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.TinyMCEv3), Constants.PropertyEditors.TinyMCEv3Alias);
CreateMap(Guid.Parse(Constants.PropertyEditors.TinyMCEv3), Constants.PropertyEditors.TinyMCEAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.TrueFalse), Constants.PropertyEditors.TrueFalseAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UserPicker), Constants.PropertyEditors.UserPickerAlias);
CreateMap(Guid.Parse(Constants.PropertyEditors.UploadField), Constants.PropertyEditors.UploadFieldAlias);

2
src/Umbraco.Core/PropertyEditors/ValueConverters/TinyMceValueConverter.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
{
public override bool IsConverter(PublishedPropertyType propertyType)
{
return propertyType.PropertyEditorAlias == Constants.PropertyEditors.TinyMCEv3Alias;
return propertyType.PropertyEditorAlias == Constants.PropertyEditors.TinyMCEAlias;
}
public override object ConvertDataToSource(PublishedPropertyType propertyType, object source, bool preview)