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

Case: http://issues.umbraco.org/issue/U4-715

Browse Source 
Removed 2nd call to cleanPropertiesOnDeletion(_contenttypeid); in PropertyType.delete()

Replaced multiple calls to db to get all documentTypes.
This commit is contained in:
AnthonyCogworks@Anthony-PC
2012-10-25 13:35:47 -01:00
parent 3f2ca8a823
commit 0b1c479428
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/umbraco.cms/businesslogic/propertytype/propertytype.cs
View File

@@ -338,11 +338,13 @@ namespace umbraco.cms.businesslogic.propertytype
FlushCache();
// clean all properties on inherited document types (if this propertytype is removed from a master)
cleanPropertiesOnDeletion(_contenttypeid);
//cleanPropertiesOnDeletion(_contenttypeid);
// DocumentType.GetAllAsList().FindAll(dt => dt.MasterContentType == _contenttypeid).ForEach(dt => cleanPropertiesOnDeletion(dt.Id));
// Delete all properties of propertytype
cleanPropertiesOnDeletion(_contenttypeid);
cleanPropertiesOnDeletion(_contenttypeid, DocumentType.GetAllAsList());
ContentType.FlushFromCache(_contenttypeid);
// Delete PropertyType ..
SqlHelper.ExecuteNonQuery("Delete from cmsPropertyType where id = " + Id);
@@ -365,11 +367,11 @@ namespace umbraco.cms.businesslogic.propertytype
}
}
private void cleanPropertiesOnDeletion(int contentTypeId)
private void cleanPropertiesOnDeletion(int contentTypeId, List<DocumentType> documentTypes )
{
// first delete from all master document types
DocumentType.GetAllAsList().FindAll(dt => dt.MasterContentType == contentTypeId).ForEach(
dt => cleanPropertiesOnDeletion(dt.Id));
documentTypes.FindAll(dt => dt.MasterContentType == contentTypeId).ForEach(
dt => cleanPropertiesOnDeletion(dt.Id, documentTypes));
// then remove from the current doc type
Content[] objs = Content.getContentOfContentType(new ContentType(contentTypeId));
@@ -380,10 +382,10 @@ namespace umbraco.cms.businesslogic.propertytype
{
prop.delete();
}
}
}
// invalidate content type cache
ContentType.FlushFromCache(contentTypeId);
//ContentType.FlushFromCache(contentTypeId);
}
public IDataType GetEditControl(object value, bool isPostBack)