diff --git a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml index 3d5fe2803..09f909412 100644 --- a/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml +++ b/src/Web/Grand.Web.Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml @@ -83,18 +83,6 @@ -
-
- -
-
- - -
-
diff --git a/src/Web/Grand.Web.Store/Controllers/SettingController.cs b/src/Web/Grand.Web.Store/Controllers/SettingController.cs index aa716bb02..7afed8599 100644 --- a/src/Web/Grand.Web.Store/Controllers/SettingController.cs +++ b/src/Web/Grand.Web.Store/Controllers/SettingController.cs @@ -128,7 +128,15 @@ public async Task GeneralCommon(GeneralCommonSettingsModel model) var storeScope = GetStoreScope(); var storeInformationSettings = await settingService.LoadSetting(storeScope); + + // Preserve the admin theme selection - store owners cannot change it + var allowToSelectAdminTheme = storeInformationSettings.AllowToSelectAdminTheme; + storeInformationSettings = model.StoreInformationSettings.ToEntity(storeInformationSettings); + + // Restore the preserved admin theme selection + storeInformationSettings.AllowToSelectAdminTheme = allowToSelectAdminTheme; + await settingService.SaveSetting(storeInformationSettings, storeScope); var dateTimeSettings = await settingService.LoadSetting(storeScope);