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
Add missing setting - AllowToSelectAdminTheme
PatrykPorabikdbc1ee716b65
diff --git a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtmlindex 39164f23c..89c4aaf38 100644--- a/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml+++ b/src/Web/Grand.Web.Admin/Areas/Admin/Views/Setting/GeneralCommon.TabStoreInformationSettings.cshtml@@ -105,6 +105,18 @@<span asp-validation-for="StoreInformationSettings.AllowCustomerToSelectTheme"></span></div></div>+ <div class="form-group">+ <div class="col-8 col-md-4 col-sm-4 text-right">+ <admin-label asp-for="StoreInformationSettings.AllowToSelectAdminTheme" class="control-label" />+ </div>+ <div class="col-4 col-md-8 col-sm-8">+ <label class="mt-checkbox mt-checkbox-outline control control-checkbox">+ <admin-input asp-for="StoreInformationSettings.AllowToSelectAdminTheme" />+ <div class="control__indicator"></div>+ </label>+ <span asp-validation-for="StoreInformationSettings.AllowToSelectAdminTheme"></span>+ </div>+ </div><div class="form-group"><div class="col-8 col-md-4 col-sm-4 text-right"><admin-label asp-for="StoreInformationSettings.LogoPicture" class="control-label" />@@ -335,6 +347,6 @@</label><span asp-validation-for="StoreInformationSettings.SitemapIncludeProducts"></span></div>- </div>+ </div></div></div>\ No newline at end of filediff --git a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs b/src/Web/Grand.Web.Admin/Controllers/SettingController.csindex 17e8587d3..d795ecbea 100644--- a/src/Web/Grand.Web.Admin/Controllers/SettingController.cs+++ b/src/Web/Grand.Web.Admin/Controllers/SettingController.cs@@ -781,6 +781,7 @@ namespace Grand.Web.Admin.Controllers}).ToList();model.StoreInformationSettings.AllowCustomerToSelectTheme = storeInformationSettings.AllowCustomerToSelectTheme;+ model.StoreInformationSettings.AllowToSelectAdminTheme = storeInformationSettings.AllowToSelectAdminTheme;model.StoreInformationSettings.LogoPicture = storeInformationSettings.LogoPicture;//EU Cookie law@@ -891,6 +892,7 @@ namespace Grand.Web.Admin.ControllersstoreInformationSettings.StoreClosed = model.StoreInformationSettings.StoreClosed;storeInformationSettings.DefaultStoreTheme = model.StoreInformationSettings.DefaultStoreTheme;storeInformationSettings.AllowCustomerToSelectTheme = model.StoreInformationSettings.AllowCustomerToSelectTheme;+ storeInformationSettings.AllowToSelectAdminTheme = model.StoreInformationSettings.AllowToSelectAdminTheme;storeInformationSettings.LogoPicture = model.StoreInformationSettings.LogoPicture;//EU Cookie lawstoreInformationSettings.DisplayCookieInformation = model.StoreInformationSettings.DisplayCookieInformation;diff --git a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.csindex f50614335..4af64d8a4 100644--- a/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs+++ b/src/Web/Grand.Web.Admin/Models/Settings/GeneralCommonSettingsModel.cs@@ -49,6 +49,9 @@ namespace Grand.Web.Admin.Models.Settings[GrandResourceDisplayName("Admin.Settings.GeneralCommon.AllowCustomerToSelectTheme")]public bool AllowCustomerToSelectTheme { get; set; }+ [GrandResourceDisplayName("Admin.Settings.GeneralCommon.AllowToSelectAdminTheme")]+ public bool AllowToSelectAdminTheme { get; set; }+[UIHint("Logo")][GrandResourceDisplayName("Admin.Settings.GeneralCommon.Logo")]public string LogoPicture { get; set; }diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 0661dc7cc..7792f855a 100644--- a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml+++ b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml@@ -11017,6 +11017,9 @@<Resource Name="Admin.Settings.GeneralCommon.AllowToReadLetsEncryptFile"><Value>Allow to read Let's Encrypt file</Value></Resource>+ <Resource Name="Admin.Settings.GeneralCommon.AllowToSelectAdminTheme">+ <Value>Allow to select admin theme</Value>+ </Resource><Resource Name="Admin.Settings.GeneralCommon.AllowToSelectStore"><Value>Allow to select store from dropdown list</Value></Resource>