lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 12:29:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Renaming Rollback to Restore.

Browse Source
This commit is contained in:
Sipke Schoorstra
2014-10-21 16:43:45 -07:00
parent ccc07b73e2
commit 1a736dadf8
17 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/AdminController.cs
View File

@@ -7,7 +7,6 @@ using Orchard.AuditTrail.ViewModels;
using Orchard.Collections;
using Orchard.ContentManagement;
using Orchard.Localization;
using Orchard.Localization.Services;
using Orchard.Security;
using Orchard.UI.Navigation;

7
src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/ContentController.cs
View File

@@ -43,16 +43,17 @@ namespace Orchard.AuditTrail.Controllers {
}
[HttpPost]
public ActionResult Rollback(int id, int version, string returnUrl) {
public ActionResult Restore(int id, int version, string returnUrl) {
var contentItem = _contentManager.Get(id);
if (!_authorizer.Authorize(Core.Contents.Permissions.PublishContent, contentItem))
return new HttpUnauthorizedResult();
var contentType = _contentDefinitionManager.GetTypeDefinition(contentItem.ContentType);
var draftable = contentType.Settings.GetModel<ContentTypeSettings>().Draftable;
_contentManager.Rollback(contentItem, VersionOptions.Rollback(version, publish: !draftable));
var restoredContentItem = _contentManager.Restore(contentItem, VersionOptions.Restore(version, publish: !draftable));
var restoredContentItemTitle = _contentManager.GetItemMetadata(restoredContentItem).DisplayText;
_notifier.Information(T("Version {0} has been restored.", version));
_notifier.Information(T("&quot;{0}&quot; has been restored.", restoredContentItemTitle));
returnUrl = Url.IsLocalUrl(returnUrl)
? returnUrl

11
src/Orchard.Web/Modules/Orchard.AuditTrail/Drivers/AuditTrailPartDriver.cs
View File

@@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using Orchard.AuditTrail.Models;
using Orchard.AuditTrail.Providers.Content;
using Orchard.AuditTrail.Services;
@@ -56,11 +55,12 @@ namespace Orchard.AuditTrail.Drivers {
var pager = new Pager(_services.WorkContext.CurrentSite, null, null);
var pageOfData = _auditTrailManager.GetRecords(pager.Page, pager.PageSize, ContentAuditTrailEventProvider.CreateFilters(part.Id, updater));
var pagerShape = shapeHelper.Pager(pager).TotalItemCount(pageOfData.TotalItemCount);
var eventDescriptors =
var eventDescriptorsQuery =
from c in _auditTrailManager.DescribeCategories()
from e in c.Events
select e;
var recordViewModels =
var eventDescriptors = eventDescriptorsQuery.ToArray();
var recordViewModelsQuery =
from record in pageOfData
let descriptor = eventDescriptors.FirstOrDefault(x => x.Event == record.FullEventName)
where descriptor != null
@@ -68,9 +68,10 @@ namespace Orchard.AuditTrail.Drivers {
Record = record,
EventDescriptor = descriptor,
CategoryDescriptor = descriptor.CategoryDescriptor,
SummaryShape = _displayBuilder.BuildDisplay(record, "SummaryAdmin")
SummaryShape = _displayBuilder.BuildDisplay(record, "SummaryAdmin"),
ActionsShape = _displayBuilder.BuildActions(record, "SummaryAdmin")
};
var recordViewModels = recordViewModelsQuery.ToArray();
return shapeHelper.Parts_AuditTrail(Records: recordViewModels, Pager: pagerShape);
}));
}

4
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/ContentAuditTrailEventProvider.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.AuditTrail.Providers.Content {
public const string Removed = "Removed";
public const string Imported = "Imported";
public const string Exported = "Exported";
public const string RolledBack = "RolledBack";
public const string Restored = "Restored";
public static Filters CreateFilters(int contentId, IUpdateModel updateModel) {
return new Filters(updateModel) {
@@ -36,7 +36,7 @@ namespace Orchard.AuditTrail.Providers.Content {
.Event(this, Removed, T("Removed"), T("A content item was deleted."), enableByDefault: true)
.Event(this, Imported, T("Imported"), T("A content item was imported."), enableByDefault: true)
.Event(this, Exported, T("Exported"), T("A content item was exported."), enableByDefault: false)
.Event(this, RolledBack, T("Rolled Back"), T("A content item was rolled back to a previous version."), enableByDefault: true);
.Event(this, Restored, T("Rolled Back"), T("A content item was rolled back to a previous version."), enableByDefault: true);
context.QueryFilter(QueryFilter);
context.DisplayFilter(DisplayFilter);

6
src/Orchard.Web/Modules/Orchard.AuditTrail/Providers/Content/GlobalContentHandler.cs
View File

@@ -57,13 +57,13 @@ namespace Orchard.AuditTrail.Providers.Content {
}
}
protected override void RollingBack(RollbackContentContext context) {
protected override void Restoring(RestoreContentContext context) {
_ignoreExportHandlerFor = context.ContentItem;
_previousVersionXml = _contentManager.Export(context.ContentItem);
_ignoreExportHandlerFor = null;
}
protected override void RolledBack(RollbackContentContext context) {
protected override void Restored(RestoreContentContext context) {
var contentItem = context.ContentItem;
_ignoreExportHandlerFor = contentItem;
@@ -71,7 +71,7 @@ namespace Orchard.AuditTrail.Providers.Content {
_ignoreExportHandlerFor = null;
var diffGram = _analyzer.GenerateDiffGram(_previousVersionXml, newVersionXml);
RecordAuditTrailEvent(ContentAuditTrailEventProvider.RolledBack, context.ContentItem, diffGram: diffGram, previousVersionXml: _previousVersionXml);
RecordAuditTrailEvent(ContentAuditTrailEventProvider.Restored, context.ContentItem, diffGram: diffGram, previousVersionXml: _previousVersionXml);
}
protected override void Published(PublishContentContext context) {

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/AuditTrailEventActions-Content-Published.SummaryAdmin.cshtml
View File

@@ -12,6 +12,6 @@
var isLatest = contentItem.VersionRecord.Number == versionNumber;
if (!isLatest) {
@T(" | ")
@Html.ActionLink(T("Rollback").Text, "Rollback", "Content", new {id = contentItem.Id, version = versionNumber, area = "Orchard.AuditTrail"}, new { data_unsafe_url = T("Are you sure you want to rollback to version {0}?", versionNumber) })
@Html.ActionLink(T("Restore").Text, "Restore", "Content", new {id = contentItem.Id, version = versionNumber, area = "Orchard.AuditTrail"}, new { data_unsafe_url = T("Are you sure you want to restore to version {0}?", versionNumber) })
}
}

2
src/Orchard.Web/Modules/Orchard.AuditTrail/Views/Parts.AuditTrail.cshtml
View File

@@ -43,7 +43,7 @@
<td class="timestamp-column">@Display.DateTime(DateTimeUtc: record.Record.CreatedUtc)</td>
<td class="summary-column">@Display(record.SummaryShape)</td>
<td class="comment-column">@Html.Raw(StringExtensions.NewlinesToHtml(record.Record.Comment))</td>
<td class="actions-column">@Html.ActionLink(T("Details").Text, "Detail", "Admin", new { id = record.Record.Id, area = "Orchard.AuditTrail" }, null)</td>
<td class="actions-column">@Display(record.ActionsShape)</td>
</tr>
}
</tbody>