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

completes: U4-6174 Remove cmsPropertyType.helpText column

Browse Source
This commit is contained in:
Shannon
2015-01-29 17:21:44 +11:00
parent 23a8777cde
commit e1e73f5e5f
19 changed files with 118 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Tests/Models/ContentTests.cs
View File

@@ -483,7 +483,6 @@ namespace Umbraco.Tests.Models
Alias = "subtitle",
Name = "Subtitle",
Description = "Optional subtitle",
HelpText = "",
Mandatory = false,
SortOrder = 3,
DataTypeDefinitionId = -88
@@ -504,7 +503,7 @@ namespace Umbraco.Tests.Models
// Act
var propertyType = new PropertyType("test", DataTypeDatabaseType.Ntext)
{
Alias = "subtitle", Name = "Subtitle", Description = "Optional subtitle", HelpText = "", Mandatory = false, SortOrder = 3, DataTypeDefinitionId = -88
Alias = "subtitle", Name = "Subtitle", Description = "Optional subtitle", Mandatory = false, SortOrder = 3, DataTypeDefinitionId = -88
};
contentType.PropertyGroups["Content"].PropertyTypes.Add(propertyType);
content.Properties.Add(new Property(propertyType){Value = "This is a subtitle Test"});
@@ -527,7 +526,6 @@ namespace Umbraco.Tests.Models
Alias = "subtitle",
Name = "Subtitle",
Description = "Optional subtitle",
HelpText = "",
Mandatory = false,
SortOrder = 3,
DataTypeDefinitionId = -88
@@ -555,7 +553,7 @@ namespace Umbraco.Tests.Models
// Act - note that the PropertyType's properties like SortOrder is not updated through the Content object
var propertyType = new PropertyType("test", DataTypeDatabaseType.Ntext)
{
Alias = "title", Name = "Title", Description = "Title description added", HelpText = "", Mandatory = false, SortOrder = 10, DataTypeDefinitionId = -88
Alias = "title", Name = "Title", Description = "Title description added", Mandatory = false, SortOrder = 10, DataTypeDefinitionId = -88
};
content.Properties.Add(new Property(propertyType));
@@ -746,7 +744,6 @@ namespace Umbraco.Tests.Models
Alias = "subtitle",
Name = "Subtitle",
Description = "Optional subtitle",
HelpText = "",
Mandatory = false,
SortOrder = 3,
DataTypeDefinitionId = -88
@@ -773,7 +770,6 @@ namespace Umbraco.Tests.Models
Alias = "coauthor",
Name = "Co-Author",
Description = "Name of the Co-Author",
HelpText = "",
Mandatory = false,
SortOrder = 4,
DataTypeDefinitionId = -88
@@ -806,7 +802,6 @@ namespace Umbraco.Tests.Models
Alias = "coauthor",
Name = "Co-Author",
Description = "Name of the Co-Author",
HelpText = "",
Mandatory = false,
SortOrder = 4,
DataTypeDefinitionId = -88
@@ -841,7 +836,6 @@ namespace Umbraco.Tests.Models
Alias = "coauthor",
Name = "Co-Author",
Description = "Name of the Co-Author",
HelpText = "",
Mandatory = false,
SortOrder = 4,
DataTypeDefinitionId = -88
@@ -855,7 +849,6 @@ namespace Umbraco.Tests.Models
Alias = "author",
Name = "Author",
Description = "Name of the Author",
HelpText = "",
Mandatory = false,
SortOrder = 4,
DataTypeDefinitionId = -88

2
src/Umbraco.Tests/Models/ContentTypeTests.cs
View File

@@ -45,7 +45,7 @@ namespace Umbraco.Tests.Models
}
//add a property type without a property group
contentType.PropertyTypeCollection.Add(
new PropertyType("test", DataTypeDatabaseType.Ntext) { Alias = "title2", Name = "Title2", Description = "", HelpText = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
new PropertyType("test", DataTypeDatabaseType.Ntext) { Alias = "title2", Name = "Title2", Description = "", Mandatory = false, SortOrder = 1, DataTypeDefinitionId = -88 });
contentType.AllowedTemplates = new[] { new Template("-1,2", "Name", "name") { Id = 200 }, new Template("-1,3", "Name2", "name2") { Id = 201 } };
contentType.AllowedContentTypes = new[] { new ContentTypeSort(new Lazy<int>(() => 888), 8, "sub"), new ContentTypeSort(new Lazy<int>(() => 889), 9, "sub2") };