Skip to content

Take the admin theme switch out of the store panel #775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KrzysztofPajak merged 1 commit into from
Aug 10, 2026
Merged

Take the admin theme switch out of the store panel #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ...Store/Areas/Store/Views/Setting/Partials/GeneralCommon.TabStoreInformationSettings.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,6 @@
<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.LogoPictureId" class="control-label"/>
Expand Down
8 changes: 8 additions & 0 deletions src/Web/Grand.Web.Store/Controllers/SettingController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,15 @@ public async Task<IActionResult> GeneralCommon(GeneralCommonSettingsModel model)
var storeScope = GetStoreScope();

var storeInformationSettings = await settingService.LoadSetting<StoreInformationSettings>(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<DateTimeSettings>(storeScope);
Expand Down
Loading