Merge origin/dev-v7-deploy into dev-v8-zbwip

This commit is contained in:
Stephan
2016-11-04 18:40:42 +01:00
64 changed files with 6702 additions and 803 deletions

View File

@@ -1825,7 +1825,7 @@ WHERE cmsContentXml.nodeId IN (
// because we already have the condition on the content being published
var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true, newest: false);
var items = descendants.Select(c => new ContentXmlDto { NodeId = c.Id, Xml = _xmlContentSerializer(c).ToDataString() }).ToArray();
db.BulkInsertRecords(db.SqlSyntax, items);
db.BulkInsertRecords(items);
processed += items.Length;
} while (processed < total);
}
@@ -1901,7 +1901,7 @@ WHERE cmsPreviewXml.nodeId IN (
NodeId = c.Id,
Xml = _xmlContentSerializer(c).ToDataString()
}).ToArray();
db.BulkInsertRecords(db.SqlSyntax, items);
db.BulkInsertRecords(items);
processed += items.Length;
} while (processed < total);
}
@@ -1971,7 +1971,7 @@ WHERE cmsContentXml.nodeId IN (
{
var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
var items = descendants.Select(m => new ContentXmlDto { NodeId = m.Id, Xml = _xmlMediaSerializer(m).ToDataString() }).ToArray();
db.BulkInsertRecords(db.SqlSyntax, items);
db.BulkInsertRecords(items);
processed += items.Length;
} while (processed < total);
}
@@ -2041,7 +2041,7 @@ WHERE cmsContentXml.nodeId IN (
{
var descendants = repository.GetPagedResultsByQuery(query, pageIndex++, groupSize, out total, "Path", Direction.Ascending, true);
var items = descendants.Select(m => new ContentXmlDto { NodeId = m.Id, Xml = _xmlMemberSerializer(m).ToDataString() }).ToArray();
db.BulkInsertRecords(db.SqlSyntax, items);
db.BulkInsertRecords(items);
processed += items.Length;
} while (processed < total);
}