lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing autoroute migrations

Browse Source 
--HG--
branch : autoroute
This commit is contained in:
Sebastien Ros
2012-02-09 12:42:35 -08:00
parent 0e56e0fd64
commit 7b16bcf33a
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard.Web/Modules/UpgradeTo14/Controllers/AdminController.cs
View File

@@ -71,14 +71,6 @@ namespace UpgradeTo14.Controllers {
var session = sessionFactory.OpenSession();
foreach (var contentType in contentTypesToMigrate) {
if (_orchardServices.ContentManager.HqlQuery().ForType(contentType).Count() > 0 &&
_orchardServices.ContentManager.HqlQuery().ForType(contentType).Slice(0, 1).FirstOrDefault() == null) {
// can't load a content item, ignore the type
_orchardServices.Notifier.Information(T("Could not process {0}. Some parts might not be compatible with Orchard 1.4, please update your modules.", contentType));
continue;
}
// migrating parts
_contentDefinitionManager.AlterTypeDefinition(contentType,
@@ -86,6 +78,10 @@ namespace UpgradeTo14.Controllers {
.WithPart("AutoroutePart")
.WithPart("TitlePart"));
// force the first object to be reloaded in order to get a valid AutoroutePart
_orchardServices.ContentManager.Flush();
_orchardServices.ContentManager.Clear();
var count = 0;
var isContainable = false;
IEnumerable<ContentItem> contents;
@@ -94,7 +90,7 @@ namespace UpgradeTo14.Controllers {
contents = _orchardServices.ContentManager.HqlQuery().ForType(contentType).Slice(count, 100);
foreach (dynamic content in contents) {
var autoroutePart = ((ContentItem) content).As<AutoroutePart>();
var autoroutePart = ((ContentItem)content).As<AutoroutePart>();
var titlePart = ((ContentItem) content).As<TitlePart>();
var commonPart = ((ContentItem) content).As<CommonPart>();
@@ -102,7 +98,7 @@ namespace UpgradeTo14.Controllers {
isContainable = true;
}
using (new TransactionScope(TransactionScopeOption.Suppress)) {
using (new TransactionScope(TransactionScopeOption.RequiresNew)) {
var command = session.Connection.CreateCommand();
command.CommandText = string.Format("SELECT Title, Path FROM {0} WHERE ContentItemRecord_Id = {1}", GetPrefixedTableName("Routable_RoutePartRecord"), autoroutePart.ContentItem.Id);
var reader = command.ExecuteReader();
@@ -120,7 +116,7 @@ namespace UpgradeTo14.Controllers {
}
_orchardServices.ContentManager.Flush();
// todo: _orchardServices.ContentManager.Clear();
_orchardServices.ContentManager.Clear();
} while (contents.Any());