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

Starts wrapping MemberTypeService from the legacy MemberType object. Changes the User.Id to an int - no more casting. Changes CreateMember to CreateMemberWithIdentity for consistency. Adds raiseEvent params to the create/save methods. Updates the MemberTypeService to have consistent naming conventions. Starts wrapping more of the MemberService from the legacy Member object.

Browse Source
This commit is contained in:
Shannon
2014-01-23 10:35:30 +11:00
parent 2956aee4e3
commit ffde0f48cf
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/umbraco.cms/businesslogic/ContentType.cs
View File

@@ -1149,6 +1149,15 @@ namespace umbraco.cms.businesslogic
return;
}
}
else if (nodeObjectType == new Guid(Constants.ObjectTypes.MemberType))
{
var memberType = ApplicationContext.Current.Services.MemberTypeService.Get(Id);
if (memberType != null)
{
PopulateContentTypeFromContentTypeBase(memberType);
return;
}
}
// TODO: Load master content types
using (var dr = SqlHelper.ExecuteReader("Select allowAtRoot, isContainer, Alias,icon,thumbnail,description from cmsContentType where nodeid=" + Id)
@@ -1183,9 +1192,8 @@ namespace umbraco.cms.businesslogic
RemoveFromDataTypeCache(ct.Alias);
// clear anything that uses this as master content type
//TODO: Update to load all content types
//Should this include "ct.nodeObjectType == media.MediaType._objectType" ?
if (ct.nodeObjectType == DocumentType._objectType)
if (ct.nodeObjectType == DocumentType._objectType
|| ct.nodeObjectType == media.MediaType._objectType)
{
//NOTE Changed from "DocumentType.GetAllAsList().FindAll(dt => dt.MasterContentType == id)" to loading master contenttypes directly from the db.
//Related to http://issues.umbraco.org/issue/U4-1714