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 - rename controller Common to Maintenance
KrzysztofPajak82769ab0dfb6
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.csindex 444309a50..8b600bb6d 100644--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateAdminSiteMap.cs@@ -33,12 +33,12 @@ namespace Grand.Business.System.Services.Migrations._1._1try{- var sitemap = repository.Table.FirstOrDefault(x => x.SystemName == "System");- if (sitemap != null)+ var sitemapSystem = repository.Table.FirstOrDefault(x => x.SystemName == "System");+ if (sitemapSystem != null){- sitemap.PermissionNames = new List<string> { PermissionSystemName.SystemLog, PermissionSystemName.MessageQueue, PermissionSystemName.MessageContactForm,+ sitemapSystem.PermissionNames = new List<string> { PermissionSystemName.SystemLog, PermissionSystemName.MessageQueue, PermissionSystemName.MessageContactForm,PermissionSystemName.Maintenance, PermissionSystemName.ScheduleTasks, PermissionSystemName.System };- var childnodeDevTools = sitemap.ChildNodes.FirstOrDefault(x => x.SystemName == "Developer tools");+ var childnodeDevTools = sitemapSystem.ChildNodes.FirstOrDefault(x => x.SystemName == "Developer tools");if (childnodeDevTools != null){childnodeDevTools.PermissionNames = new List<string> { PermissionSystemName.Maintenance, PermissionSystemName.System };@@ -48,13 +48,43 @@ namespace Grand.Business.System.Services.Migrations._1._1childnodeRoslyn.PermissionNames = new List<string> { PermissionSystemName.System };childnodeRoslyn.ControllerName = "System";}+ var childnodeSysInformation = sitemapSystem.ChildNodes.FirstOrDefault(x => x.SystemName == "System information");+ if (childnodeSysInformation != null)+ {+ childnodeSysInformation.ControllerName = "System";+ childnodeSysInformation.PermissionNames = new List<string> { PermissionSystemName.System };+ }++ var childnodeCss = childnodeDevTools.ChildNodes.FirstOrDefault(x => x.SystemName == "Custom css");+ if (childnodeCss != null)+ childnodeCss.ControllerName = "Maintenance";++ var childnodeJs = childnodeDevTools.ChildNodes.FirstOrDefault(x => x.SystemName == "Custom JS");+ if (childnodeJs != null)+ childnodeJs.ControllerName = "Maintenance";++ var childnodeRobots = childnodeDevTools.ChildNodes.FirstOrDefault(x => x.SystemName == "Robot.txt");+ if (childnodeRobots != null)+ childnodeRobots.ControllerName = "Maintenance";}- var childnodeSysInformation = sitemap.ChildNodes.FirstOrDefault(x => x.SystemName == "System information");- if (childnodeSysInformation != null)- childnodeSysInformation.ControllerName = "System";++ var childnodeMaintenance = sitemapSystem.ChildNodes.FirstOrDefault(x => x.SystemName == "Maintenance");+ if (childnodeMaintenance != null)+ childnodeMaintenance.ControllerName = "Maintenance";- repository.Update(sitemap);+ repository.Update(sitemapSystem);}++ var sitemapConfiguration = repository.Table.FirstOrDefault(x => x.SystemName == "Configuration");+ if (sitemapConfiguration != null)+ {+ var childnodeSeo = sitemapConfiguration.ChildNodes.FirstOrDefault(x => x.SystemName == "Search engine friendly names");+ if (childnodeSeo != null)+ childnodeSeo.ControllerName = "Maintenance";++ repository.Update(sitemapConfiguration);+ }+}catch (Exception ex){diff --git a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs b/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.csindex bcdb2f3c2..5377023ee 100644--- a/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs+++ b/src/Business/Grand.Business.System/Utilities/StandardAdminSiteMap.cs@@ -667,7 +667,7 @@ namespace Grand.Business.System.UtilitiesSystemName = "Search engine friendly names",ResourceName = "Admin.Configuration.SeNames",PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ ControllerName = "Maintenance",ActionName = "SeNames",IconClass = "fa fa-dot-circle-o"},@@ -1004,7 +1004,7 @@ namespace Grand.Business.System.UtilitiesSystemName = "Maintenance",ResourceName = "Admin.System.Maintenance",PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ ControllerName = "Maintenance",ActionName = "Maintenance",IconClass = "fa fa-dot-circle-o"},@@ -1042,7 +1042,7 @@ namespace Grand.Business.System.UtilitiesSystemName = "Custom css",ResourceName = "Admin.System.CustomCss",PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ ControllerName = "Maintenance",ActionName = "CustomCss",IconClass = "fa fa-dot-circle-o"},@@ -1050,7 +1050,7 @@ namespace Grand.Business.System.UtilitiesSystemName = "Custom JS",ResourceName = "Admin.System.CustomJs",PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ ControllerName = "Maintenance",ActionName = "CustomJs",IconClass = "fa fa-dot-circle-o"},@@ -1058,7 +1058,7 @@ namespace Grand.Business.System.UtilitiesSystemName = "Robot.txt",ResourceName = "Admin.System.AdditionsRobotsTxt",PermissionNames = new List<string> { PermissionSystemName.Maintenance },- ControllerName = "Common",+ ControllerName = "Maintenance",ActionName = "AdditionsRobotsTxt",IconClass = "fa fa-dot-circle-o"}diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Roslyn.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Roslyn.cshtmldeleted file mode 100644index 80720f1b5..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Roslyn.cshtml+++ /dev/null@@ -1,84 +0,0 @@-@model bool-@inject AdminAreaSettings adminAreaSettings-@{- //page title- ViewBag.Title = Loc["Admin.System.Roslyn"];-}---<div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title level-caption">- <div class="caption level-caption">- <i class="fa fa-sitemap"></i>- @Loc["Admin.System.Roslyn"]- </div>- <vc:admin-widget widget-zone="roslyn_buttons" additional-data="null" />- </div>- @if (!Model)- {- <div class="note note-success">- @Loc["Admin.System.Roslyn.Disabled"]- </div>- }- <div class="x_content">- <vc:admin-widget widget-zone="roslyn_top" additional-data="null" />- <div id="roslyn-grid"></div>- <vc:admin-widget widget-zone="roslyn_bottom" additional-data="null" />- </div>- </div>- </div>-</div>--<script>- $(document).ready(function () {- $("#roslyn-grid").kendoGrid({- dataSource: {- transport: {- read: {- url: "@Html.Raw(Url.Action("Roslyn", "Common", new { area = Constants.AreaAdmin }))",- type: "POST",- dataType: "json",- data: addAntiForgeryToken- }- },- schema: {- data: "Data",- total: "Total",- errors: "Errors"- },- error: function(e) {- display_kendoui_grid_error(e);- // Cancel the changes- this.cancelChanges();- },- pageSize: @(adminAreaSettings.DefaultGridPageSize),- serverPaging: true,- serverFiltering: true,- serverSorting: true- },- pageable: {- refresh: true,- pageSizes: [@(adminAreaSettings.GridPageSizes)]- },- scrollable: false,- columns: [{- field: "FileName",- title: "@Loc["Admin.System.Roslyn.FileName"]",- width: 100,- },{- field: "IsCompiled",- title: "@Loc["Admin.System.Roslyn.IsCompiled"]",- width: 50,- headerAttributes: { style: "text-align:center" },- attributes: { style: "text-align:center" },- template: '# if(IsCompiled) {# <i class="fa fa-check" aria-hidden="true" style="color:green"></i> #} else {# <i class="fa fa-times" aria-hidden="true" style="color:red"></i> #} #'- }, {- field: "Errors",- title: "@Loc["Admin.System.Roslyn.Errors"]",- width: 500- }]- });- });-</script>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/SystemInfo.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/SystemInfo.cshtmldeleted file mode 100644index 5d9e07460..000000000--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/SystemInfo.cshtml+++ /dev/null@@ -1,214 +0,0 @@-@model SystemInfoModel--@inject Microsoft.AspNetCore.Http.IHttpContextAccessor httpContextAccessor;--@{- //page title- ViewBag.Title = Loc["Admin.System.SystemInfo"];-}--<div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption level-caption">- <i class="fa fa-tasks"></i>- @Loc["Admin.System.SystemInfo"]- </div>- <vc:admin-widget widget-zone="system_info_buttons" additional-data="null" />- </div>- <div class="x_content form">- <vc:admin-widget widget-zone="system_info_top" additional-data="null" />- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div class="form-horizontal">- <div class="form-body">- <div class="form-group">- <admin-label asp-for="GrandVersion" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.GrandVersion</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="OperatingSystem" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.OperatingSystem</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="MachineName" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.MachineName</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="AspNetInfo" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.AspNetInfo</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="ServerTimeZone" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.ServerTimeZone</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="ServerLocalTime" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.ServerLocalTime.ToString("F")</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="ApplicationTime" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.ApplicationTime.ToString("F")</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="UtcTime" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@Model.UtcTime.ToString("F")</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="RequestScheme" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@httpContextAccessor.HttpContext.Request.Scheme</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="IsHttps" />- <div class="col-md-9 col-sm-9">- <label class="control-label">@httpContextAccessor.HttpContext.Request.IsHttps</label>- </div>- </div>- <div class="form-group">- <admin-label asp-for="ServerVariables" />- <div class="col-md-9 col-sm-9">- <label class="control-label">- <a id="serverVariablesShowHide" href="javascript:toggleLoadedServerVariables();">@Loc["Admin.Common.Show"]</a>- </label>- <div id="pnlServerVariables" style="display:none">- @foreach (var serverVariable in Model.ServerVariables)- {- @serverVariable.Name<text>:</text> @serverVariable.Value- <br />- }- </div>- </div>- </div>- <div class="form-group">- <admin-label asp-for="LoadedAssemblies" />- <div class="col-md-9 col-sm-9">- <label class="control-label"><a id="loadedAssembliesShowHide" href="javascript:toggleLoadedAssemblies();">@Loc["Admin.Common.Show"]</a></label>- <div id="pnlLoadedAssemblies" style="display:none">- @foreach (var assembly in Model.LoadedAssemblies)- {- @assembly.FullName- if (!String.IsNullOrEmpty(assembly.Location))- {- <br />- <em>@assembly.Location</em>- }- <br />- }- </div>- </div>- </div>- </div>-- </div>- </div>- </div>- </div>- <vc:admin-widget widget-zone="system_info_bottom" additional-data="null" />- </div>- </div>- </div>-</div>-<div class="row">- <div class="col-md-12">- <div class="x_panel light form-fit">- <div class="x_title">- <div class="caption level-caption">- <i class="fa fa-tasks"></i>- @Loc["Admin.System.Warnings"]- </div>- <vc:admin-widget widget-zone="warnings_buttons" additional-data="null" />- </div>- <vc:admin-widget widget-zone="warnings_top" additional-data="null" />- <div class="form-horizontal">- <div class="form-body">- <div class="x_content">- <div class="form-horizontal">- @foreach (var warning in Model.SystemWarnings)- {- switch (warning.Level)- {- case SystemInfoModel.SystemWarningModel.SystemWarningLevel.Pass:- {- <div class="form-group">- <div class="offset-md-2 col-md-10 col-sm-10">- <label class="control-label">- @warning.Text- </label>- </div>- </div>- }- break;- case SystemInfoModel.SystemWarningModel.SystemWarningLevel.Warning:- {- <div class="form-group">- <div class="offset-md-2 col-md-10 col-sm-10">- <label class="control-label">- @warning.Text- </label>- </div>- </div>- }- break;- case SystemInfoModel.SystemWarningModel.SystemWarningLevel.Fail:- {- <div class="form-group">- <div class="offset-md-2 col-md-10 col-sm-10">- <label class="control-label">- @warning.Text- </label>- </div>- </div>- }- break;- }- }- <vc:admin-widget widget-zone="warnings_bottom" additional-data="null" />- </div>- </div>- </div>- </div>- </div>- </div>-</div>--<script>- function toggleLoadedAssemblies() {- $('#pnlLoadedAssemblies').toggle();- if ($('#pnlLoadedAssemblies').css('display') == 'none') {- $('#loadedAssembliesShowHide').html('@Loc["Admin.Common.Show"]');- }- else {- $('#loadedAssembliesShowHide').html('@Loc["Admin.Common.Hide"]');- }- }-- function toggleLoadedServerVariables() {- $('#pnlServerVariables').toggle();- if ($('#pnlServerVariables').css('display') == 'none') {- $('#serverVariablesShowHide').html('@Loc["Admin.Common.Show"]');- }- else {- $('#serverVariablesShowHide').html('@Loc["Admin.Common.Hide"]');- }- }-</script>diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/AdditionsRobotsTxt.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/AdditionsRobotsTxt.cshtmlsimilarity index 95%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/AdditionsRobotsTxt.cshtmlrename to src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/AdditionsRobotsTxt.cshtmlindex 4a1bcae40..1fe2e8cbe 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/AdditionsRobotsTxt.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/AdditionsRobotsTxt.cshtml@@ -44,7 +44,7 @@$('#btnSave').click(function () {$.ajax({cache: false,- url: "@Url.Action("SaveRobotsTxt", "Common", new { area = Constants.AreaAdmin })",+ url: "@Url.Action("SaveRobotsTxt", "Maintenance", new { area = Constants.AreaAdmin })",data: additionalData(),type: 'POST',success: function (response) {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/CustomCss.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtmlsimilarity index 96%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/CustomCss.cshtmlrename to src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtmlindex b1417fad7..f2698b8f5 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/CustomCss.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomCss.cshtml@@ -57,7 +57,7 @@$('#btnSave').click(function () {$.ajax({cache: false,- url: "@Url.Action("SaveEditor", "Common", new { area = Constants.AreaAdmin })",+ url: "@Url.Action("SaveEditor", "Maintenance", new { area = Constants.AreaAdmin })",data: additionalData(),type: 'POST',success: function (response) {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/CustomJs.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtmlsimilarity index 97%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/CustomJs.cshtmlrename to src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtmlindex 9537ebe25..145eaabaf 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/CustomJs.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/CustomJs.cshtml@@ -56,7 +56,7 @@$('#btnSave').click(function () {$.ajax({cache: false,- url: "@Url.Action("SaveEditor", "Common", new { area = Constants.AreaAdmin })",+ url: "@Url.Action("SaveEditor", "Maintenance", new { area = Constants.AreaAdmin })",data: additionalData(),type: 'POST',success: function (response) {diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/Maintenance.cshtmlsimilarity index 98%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtmlrename to src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/Maintenance.cshtmlindex 541e55ff4..449223f5d 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/Maintenance.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/Maintenance.cshtml@@ -3,7 +3,7 @@//page titleViewBag.Title = Loc["Admin.System.Maintenance"];}-<form asp-area="@Constants.AreaAdmin" asp-controller="Common" asp-action="Maintenance" method="post">+<form asp-area="@Constants.AreaAdmin" asp-controller="Maintenance" asp-action="Maintenance" method="post"><div class="row"><div class="col-md-12">diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/SeNames.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/SeNames.cshtmlsimilarity index 97%rename from src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/SeNames.cshtmlrename to src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/SeNames.cshtmlindex 3a5722331..56d06087a 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Common/SeNames.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Maintenance/SeNames.cshtml@@ -61,7 +61,7 @@dataSource: {transport: {read: {- url: "@Html.Raw(Url.Action("SeNames", "Common", new { area = Constants.AreaAdmin }))",+ url: "@Html.Raw(Url.Action("SeNames", "Maintenance", new { area = Constants.AreaAdmin }))",type: "POST",dataType: "json",data: additionalData@@ -156,7 +156,7 @@$.ajax({cache: false,type: "POST",- url: "@(Url.Action("DeleteSelectedSeNames", "Common", new { area = Constants.AreaAdmin }))",+ url: "@(Url.Action("DeleteSelectedSeNames", "Maintenance", new { area = Constants.AreaAdmin }))",data: postData,complete: function(data) {//reload griddiff --git a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cssimilarity index 99%rename from src/Web/Grand.Web.Admin/Controllers/CommonController.csrename to src/Web/Grand.Web.Admin/Controllers/MaintenanceController.csindex 29cd687f5..9a7e9f76c 100644--- a/src/Web/Grand.Web.Admin/Controllers/CommonController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/MaintenanceController.cs@@ -24,7 +24,7 @@ using System.Threading.Tasks;namespace Grand.Web.Admin.Controllers{[PermissionAuthorize(PermissionSystemName.Maintenance)]- public partial class CommonController : BaseAdminController+ public partial class MaintenanceController : BaseAdminController{#region Fields@@ -40,7 +40,7 @@ namespace Grand.Web.Admin.Controllers#region Constructors- public CommonController(+ public MaintenanceController(ICustomerService customerService,ISlugService slugService,IDateTimeService dateTimeService,