lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Adding an upgrade step for 1.x users

Browse Source
This commit is contained in:
Sebastien Ros
2014-03-27 15:05:15 -07:00
parent 1ca5fa5483
commit 184c41e6d7
2 changed files with 75 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/Orchard.Web/Modules/Upgrade/Controllers/InfosetController.cs
View File

@@ -3,11 +3,15 @@ using System.Collections.Generic;
using System.Linq;
using System.Security.Authentication;
using System.Web.Mvc;
using System.Xml.Linq;
using Orchard;
using Orchard.Caching;
using Orchard.ContentManagement;
using Orchard.ContentManagement.FieldStorage.InfosetStorage;
using Orchard.ContentManagement.Records;
using Orchard.Core.Common.Models;
using Orchard.Core.Settings.Models;
using Orchard.Data;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.MediaLibrary.Models;
@@ -22,14 +26,23 @@ namespace Upgrade.Controllers {
public class InfosetController : Controller {
private readonly IOrchardServices _orchardServices;
private readonly IUpgradeService _upgradeService;
private readonly ISignals _signals;
private readonly IRepository<ContentItemRecord> _contentItemRecord;
private readonly IRepository<ContentItemVersionRecord> _contentItemVersionRecord;
private const int BATCH = 50;
public InfosetController(
IOrchardServices orchardServices,
IUpgradeService upgradeService) {
IUpgradeService upgradeService,
IRepository<ContentItemRecord> contentItemRecord,
IRepository<ContentItemVersionRecord> contentItemVersionRecord,
ISignals signals) {
_orchardServices = orchardServices;
_upgradeService = upgradeService;
_signals = signals;
_contentItemVersionRecord = contentItemVersionRecord;
_contentItemRecord = contentItemRecord;
Logger = NullLogger.Instance;
}
@@ -65,6 +78,8 @@ namespace Upgrade.Controllers {
});
_upgradeService.ExecuteReader("DROP TABLE " + siteTable, null);
_signals.Trigger("SiteCurrentTheme");
}
#endregion
@@ -264,8 +279,6 @@ namespace Upgrade.Controllers {
}
#endregion
// todo: user records
_orchardServices.Notifier.Information(T("Site Settings migrated successfully"));
return View();
@@ -547,6 +560,53 @@ namespace Upgrade.Controllers {
return new JsonResult { Data = lastContentItemId };
}
[HttpPost]
public JsonResult FixContentItemVersionPart(int id) {
string[] ignoredParts = new string[] { "CommonPart", "WidgetPart", "LayerPart", "IdentityPart", "UserPart", "MenuItemPart"};
if (!_orchardServices.Authorizer.Authorize(StandardPermissions.SiteOwner))
throw new AuthenticationException("");
var lastContentItemVersionId = id;
var contentItemVersionTable = _upgradeService.GetPrefixedTableName("Orchard_Framework_ContentItemVersionRecord");
var contentItemTable = _upgradeService.GetPrefixedTableName("Orchard_Framework_ContentItemRecord");
foreach(var contentItemRecord in _contentItemRecord.Table.Take(BATCH).Where(x => x.Id > id)) {
lastContentItemVersionId = contentItemRecord.Id;
if (!String.IsNullOrWhiteSpace(contentItemRecord.Data)) {
var data = XDocument.Parse(contentItemRecord.Data).Root; // <Data /> element
foreach (var contentItemVersionRecord in _contentItemVersionRecord.Table.Where(x => (x.Published || x.Latest) && x.ContentItemRecord == contentItemRecord)) {
var versionData = new XDocument(new XElement("Data")).Root;
if (!String.IsNullOrWhiteSpace(contentItemVersionRecord.Data)) {
versionData = XDocument.Parse(contentItemVersionRecord.Data).Root;
}
// copy each XML element from ContentItem to ContentItemVersionRecord
foreach (XElement element in data.Elements()) {
if (ignoredParts.Contains(element.Name.ToString())) {
continue;
}
if (element.Name.ToString().EndsWith("SettingsPart")) {
continue;
}
var versionElement = versionData.Element(element.Name);
if (versionElement == null) {
versionData.Add(element);
}
}
contentItemVersionRecord.Data = versionData.ToString(SaveOptions.DisableFormatting);
}
}
}
return new JsonResult { Data = lastContentItemVersionId };
}
private static string ConvertToString(object readerValue) {
return readerValue == DBNull.Value ? null : (string)readerValue;
@@ -569,5 +629,7 @@ namespace Upgrade.Controllers {
}
return false;
}
public object SiteThemeService { get; set; }
}
}

11
src/Orchard.Web/Modules/Upgrade/Views/Infoset/Index.cshtml
View File

@@ -75,6 +75,14 @@
<button type="button" class="button button-migrate" data-url="@Url.Action("MigrateMenuItemPart", "Infoset")">@T("Migrate")</button>
</fieldset>
@if (Request.RawUrl.EndsWith("1.x")) {
<fieldset>
<legend>@T("FIXING 1.x VERSIONS:")</legend>
<span class="hint">@T("This migration step will merge version infosets.")</span>
<button type="button" class="button button-migrate" data-url="@Url.Action("FixContentItemVersionPart", "Infoset")">@T("Migrate")</button>
</fieldset>
}
@using (Script.Foot()) {
<script type="text/javascript">
$(function() {
@@ -87,7 +95,8 @@
var startId = 0;
$('#message-progress').show();
var iId = setInterval(function() {
var iId = setInterval(function () {
$.ajax({
type: 'POST',
url: importUrl,