mirror of
https://github.com/aljazceru/btcpayserver.git
synced 2026-02-14 02:34:25 +01:00
Merge pull request #6758 from monicamuyama/clean/6754-sort-dropdown
Add sorting functionality to the stores dropdown as well as Archives
This commit is contained in:
@@ -466,7 +466,9 @@ namespace BTCPayServer.Controllers
|
||||
|
||||
private async Task<T> SetViewModelValues<T>(T viewModel) where T : AddApiKeyViewModel
|
||||
{
|
||||
viewModel.Stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
|
||||
var stores = await _StoreRepository.GetStoresByUserId(_userManager.GetUserId(User));
|
||||
viewModel.Stores = stores.OrderBy(store => store.StoreName, StringComparer.InvariantCultureIgnoreCase).ToArray();
|
||||
|
||||
var isAdmin = (await _authorizationService.AuthorizeAsync(User, Policies.CanModifyServerSettings))
|
||||
.Succeeded;
|
||||
viewModel.PermissionValues ??= Policies.AllPolicies
|
||||
|
||||
@@ -52,6 +52,7 @@ namespace BTCPayServer.Controllers
|
||||
{
|
||||
Stores = stores
|
||||
.Where(s => s.Archived == archived)
|
||||
.OrderBy(s => s.StoreName, StringComparer.InvariantCultureIgnoreCase)
|
||||
.Select(s => new ListStoresViewModel.StoreViewModel
|
||||
{
|
||||
StoreId = s.Id,
|
||||
|
||||
Reference in New Issue
Block a user