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

Fixes up some v7 failing tests.

Browse Source
This commit is contained in:
Shannon
2013-08-09 12:10:42 +10:00
parent 01510ce126
commit f4bd10065e
6 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Models/ContentExtensions.cs
View File

@@ -228,9 +228,9 @@ namespace Umbraco.Core.Models
/// <returns></returns>
public static IEnumerable<Property> GetNonGroupedProperties(this IContentBase content)
{
var propertyIdsInTabs = content.PropertyGroups.SelectMany(pg => pg.PropertyTypes).Select(pt => pt.Id);
var propertyIdsInTabs = content.PropertyGroups.SelectMany(pg => pg.PropertyTypes);
return content.Properties
.Where(property => propertyIdsInTabs.Contains(property.PropertyTypeId) == false)
.Where(property => propertyIdsInTabs.Contains(property.PropertyType) == false)
.OrderBy(x => x.PropertyType.SortOrder);
}

2
src/Umbraco.Core/Models/PropertyExtensions.cs
View File

@@ -75,7 +75,7 @@ namespace Umbraco.Core.Models
else
{
//NOTE: An exception will be thrown if this doesn't exist
var legacyDataType = property.PropertyType.DataType(property.Id, ApplicationContext.Current.Services.DataTypeService);
var legacyDataType = property.PropertyType.DataType(property.Id, dataTypeService);
//We've already got the value for the property so we're going to give it to the
// data type's data property so it doesn't go re-look up the value from the db again.