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 2 Packages Projects Releases Wiki Activity

Recycle Bin improvements (Lombiq Technologies: COLI-1711) (#8890)
Some checks failed
Build Crowdin Translation Packages / build-crowdin-translation-packages (push) Has been cancelled
Details
Compile / Compile .NET solution (push) Has been cancelled
Details
Compile / Compile Client-side Assets (push) Has been cancelled
Details
SpecFlow Tests / SpecFlow Tests (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Benedek Farkas
2026-01-25 17:54:35 +01:00
committed by GitHub
parent 8687ca0a98
commit d58037bd8f
3 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Orchard.Web/Modules/Orchard.AuditTrail/Controllers/RecycleBinController.cs
View File

@@ -4,7 +4,6 @@ using System.Linq;
using System.Web.Mvc;
using Orchard.AuditTrail.Helpers;
using Orchard.AuditTrail.Services;
using Orchard.AuditTrail.Services.Models;
using Orchard.AuditTrail.ViewModels;
using Orchard.ContentManagement;
using Orchard.Environment.Extensions;
@@ -28,21 +27,19 @@ namespace Orchard.AuditTrail.Controllers
private readonly IOrchardServices _services;
private readonly IRecycleBin _recycleBin;
public RecycleBinController(IAuthorizer authorizer, IContentManager contentManager, INotifier notifier, IOrchardServices services, IRecycleBin recycleBin)
public RecycleBinController(IOrchardServices services, IRecycleBin recycleBin)
{
_authorizer = authorizer;
_contentManager = contentManager;
_notifier = notifier;
_authorizer = services.Authorizer;
_contentManager = services.ContentManager;
_notifier = services.Notifier;
_services = services;
_recycleBin = recycleBin;
T = NullLocalizer.Instance;
Logger = NullLogger.Instance;
}
public Localizer T { get; set; }
public ILogger Logger { get; set; }
public Localizer T { get; set; } = NullLocalizer.Instance;
public ILogger Logger { get; set; } = NullLogger.Instance;
public ActionResult Index(PagerParameters pagerParameters, AuditTrailOrderBy? orderBy = null)
public ActionResult Index(PagerParameters pagerParameters)
{
if (!_authorizer.Authorize(Permissions.ViewAuditTrail))
return new HttpUnauthorizedResult();
@@ -76,7 +73,7 @@ namespace Orchard.AuditTrail.Controllers
ModelState.AddModelError("RecycleBinCommand", T("Please select an action to execute.").Text);
}
if (viewModel.SelectedContentItems == null || !viewModel.SelectedContentItems.Any())
if (viewModel.SelectedContentItems == null || !viewModel.SelectedContentItems.Any(item => item.Selected))
{
ModelState.AddModelError("SelectedContentItems", T("Please select one or more content items.").Text);
}
@@ -108,10 +105,10 @@ namespace Orchard.AuditTrail.Controllers
{
var pager = new Pager(_services.WorkContext.CurrentSite, pagerParameters);
var removedContentItems = _recycleBin.List(pager.Page, pager.PageSize);
var pagershape = _services.New.Pager(pager).TotalItemCount(removedContentItems.TotalItemCount);
var pagerShape = _services.New.Pager(pager).TotalItemCount(removedContentItems.TotalItemCount);
viewModel.ContentItems = removedContentItems;
viewModel.Pager = pagershape;
viewModel.Pager = pagerShape;
return viewModel;
}
@@ -143,7 +140,9 @@ namespace Orchard.AuditTrail.Controllers
var contentItemTitle = _contentManager.GetItemMetadata(contentItem).DisplayText;
if (!_authorizer.Authorize(Core.Contents.Permissions.DeleteContent, contentItem))
{
_notifier.Error(T("You need to have permission to delete <strong>{0}</strong> to be able to permanently delete it.", contentItemTitle));
_notifier.Error(
T("You need to have permission to delete <strong>{0}</strong> to be able to permanently delete it.",
contentItemTitle));
continue;
}
@@ -162,4 +161,4 @@ namespace Orchard.AuditTrail.Controllers
}
}
}
}