Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Admin panel - Allow to clear log from Maintenance
KrzysztofPajak8f1cf35abd37
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtmlindex 4e84c6a56..541e55ff4 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtml@@ -103,6 +103,20 @@</div>}</div>+ <div class="form-body panel panel-default">+ <div class="note note-info">+ <strong>@Loc["Admin.System.Maintenance.DeleteSystemLog"]</strong>+ </div>+ <div class="form-group">+ <input type="submit" name="delete-systemlog" asp-action="MaintenanceDeleteSystemlog" class="btn red offset-md-3" value="@Loc["Admin.Common.Delete"]" />+ </div>+ @if (Model.DeleteSystemLog)+ {+ <div class="form-group">+ <label class="offset-md-3">@Loc["Admin.System.Maintenance.DeleteSystemLog.Deleted"]</label>+ </div>+ }+ </div><div class="form-body panel panel-default"><div class="note note-info form-actions"><strong>@Loc["Admin.System.Maintenance.ConvertPicture"]</strong>diff --git a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs b/src/Web/Grand.Web.Admin/Controllers/CommonController.csindex cdb4ea16b..d26371897 100644--- a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/CommonController.cs@@ -53,7 +53,6 @@ namespace Grand.Web.Admin.Controllersprivate readonly ILanguageService _languageService;private readonly IWorkContext _workContext;private readonly ITranslationService _translationService;- private readonly IStoreService _storeService;private readonly IMachineNameProvider _machineNameProvider;private readonly IHostApplicationLifetime _applicationLifetime;private readonly IMediator _mediator;@@ -76,7 +75,6 @@ namespace Grand.Web.Admin.ControllersILanguageService languageService,IWorkContext workContext,ITranslationService translationService,- IStoreService storeService,IMachineNameProvider machineNameProvider,IHostApplicationLifetime applicationLifetime,IMediator mediator,@@ -97,7 +95,6 @@ namespace Grand.Web.Admin.Controllers_languageService = languageService;_workContext = workContext;_translationService = translationService;- _storeService = storeService;_applicationLifetime = applicationLifetime;_appConfig = appConfig;_machineNameProvider = machineNameProvider;@@ -310,6 +307,9 @@ namespace Grand.Web.Admin.Controllersif (TempData["DeleteActivityLog"] != null)model.DeleteActivityLog = (bool)TempData["DeleteActivityLog"];+ if (TempData["DeleteSystemLog"] != null)+ model.DeleteSystemLog = (bool)TempData["DeleteSystemLog"];+if (TempData["NumberOfConvertItems"] != null){model.ConvertedPictureModel = new MaintenanceModel.ConvertPictureModel {@@ -356,6 +356,15 @@ namespace Grand.Web.Admin.Controllersreturn RedirectToAction("Maintenance");}+ [HttpPost]+ public async Task<IActionResult> MaintenanceDeleteSystemlog(MaintenanceModel model, [FromServices] ILogger logger)+ {+ await logger.ClearLog();+ TempData["DeleteSystemLog"] = true;+ return RedirectToAction("Maintenance");+ }++[HttpPost]public async Task<IActionResult> MaintenanceConvertPicture([FromServices] IPictureService pictureService,@@ -387,6 +396,7 @@ namespace Grand.Web.Admin.Controllersreturn RedirectToAction("Maintenance");}+public async Task<IActionResult> ClearCache(string returnUrl, [FromServices] ICacheBase cacheBase){await cacheBase.Clear();diff --git a/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs b/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.csindex d5278e4ba..72d6b7675 100644--- a/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Common/MaintenanceModel.cs@@ -21,6 +21,7 @@ namespace Grand.Web.Admin.Models.Commonpublic ConvertPictureModel ConvertedPictureModel { get; set; }public bool DeleteActivityLog { get; set; }+ public bool DeleteSystemLog { get; set; }#region Nested classesdiff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 4366f279a..4c094b41b 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -12279,6 +12279,12 @@<Resource Name="Admin.System.Maintenance.DeleteGuests.TotalDeleted"><Value>{0} customers were deleted</Value></Resource>+ <Resource Name="Admin.System.Maintenance.DeleteSystemLog">+ <Value>Deleting system Log</Value>+ </Resource>+ <Resource Name="Admin.System.Maintenance.DeleteSystemLog.Deleted">+ <Value>Deleted system Log</Value>+ </Resource><Resource Name="Admin.System.QueuedEmails"><Value>Message Queue</Value></Resource>