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

U4-9907 Translations Section : Getting "open datareader" Issue : Relates to (U4-9201)

Browse Source
This commit is contained in:
Shannon
2017-05-23 16:23:40 +10:00
parent c843e634ba
commit 27428bf545
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -611,21 +611,19 @@ namespace umbraco.cms.businesslogic
//its own + inherited property types, which is wrong. Once we are able to fully switch to the new api
//this should no longer be a problem as the composition always contains a correct list of property types.
var result = new Dictionary<int, PropertyType>();
using (var sqlHelper = Application.SqlHelper)
using (IRecordsReader dr = sqlHelper.ExecuteReader(
"select id from cmsPropertyType where contentTypeId = @ctId order by sortOrder",
sqlHelper.CreateParameter("@ctId", Id)))
{
while (dr.Read())
{
int id = dr.GetInt("id");
PropertyType pt = PropertyType.GetPropertyType(id);
if (pt != null)
result.Add(pt.Id, pt);
}
}
// Get Property Types from the master content type
var ids = ApplicationContext.Current.DatabaseContext.Database.Fetch<int>(
"select id from cmsPropertyType where contentTypeId = @ctId order by sortOrder",
new {ctId = Id});
foreach (var id in ids)
{
var pt = PropertyType.GetPropertyType(id);
if (pt != null)
result.Add(pt.Id, pt);
}
// Get Property Types from the master content type
if (MasterContentTypes.Count > 0)
{
foreach (var mct in MasterContentTypes)