aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only display storage providers that can actually be set in dropdown

Browse Source
This commit is contained in:
rockstardev
2021-04-18 14:03:22 -05:00
parent 99dd6f3e50
commit 04a29ece3b
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
BTCPayServer/Controllers/ServerController.Storage.cs
View File

@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using BTCPayServer.Abstractions.Extensions; using BTCPayServer.Abstractions.Extensions;
@@ -19,6 +20,8 @@ using BTCPayServer.Storage.ViewModels;
using BTCPayServer.Views; using BTCPayServer.Views;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace BTCPayServer.Controllers namespace BTCPayServer.Controllers
@@ -175,8 +178,13 @@ namespace BTCPayServer.Controllers
var savedSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>(); var savedSettings = await _SettingsRepository.GetSettingAsync<StorageSettings>();
if (forceChoice || savedSettings == null) if (forceChoice || savedSettings == null)
{ {
var providersList = _StorageProviderServices.Select(a =>
new SelectListItem(a.StorageProvider().ToString(), a.StorageProvider().ToString())
);
return View(new ChooseStorageViewModel() return View(new ChooseStorageViewModel()
{ {
ProvidersList = providersList,
ShowChangeWarning = savedSettings != null, ShowChangeWarning = savedSettings != null,
Provider = savedSettings?.Provider ?? BTCPayServer.Storage.Models.StorageProvider.FileSystem Provider = savedSettings?.Provider ?? BTCPayServer.Storage.Models.StorageProvider.FileSystem
}); });

3
BTCPayServer/Storage/ViewModels/ChooseStorageViewModel.cs
View File

@@ -1,9 +1,12 @@
using System.Collections.Generic;
using BTCPayServer.Storage.Models; using BTCPayServer.Storage.Models;
using Microsoft.AspNetCore.Mvc.Rendering;
namespace BTCPayServer.Storage.ViewModels namespace BTCPayServer.Storage.ViewModels
{ {
public class ChooseStorageViewModel public class ChooseStorageViewModel
{ {
public IEnumerable<SelectListItem> ProvidersList { get; set; }
public StorageProvider Provider { get; set; } public StorageProvider Provider { get; set; }
public bool ShowChangeWarning { get; set; } public bool ShowChangeWarning { get; set; }
} }

4
BTCPayServer/Views/Server/Storage.cshtml
View File

@@ -1,4 +1,4 @@
@using BTCPayServer.Storage.Models @using BTCPayServer.Storage.Models
@model BTCPayServer.Storage.ViewModels.ChooseStorageViewModel @model BTCPayServer.Storage.ViewModels.ChooseStorageViewModel
@{ @{
ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Storage"); ViewData.SetActivePageAndTitle(ServerNavPages.Services, "Storage");
@@ -22,7 +22,7 @@
} }
<div class="form-group"> <div class="form-group">
<label asp-for="Provider"></label> <label asp-for="Provider"></label>
<select asp-for="Provider" asp-items="@Html.GetEnumSelectList<StorageProvider>()" class="form-control"></select> <select asp-for="Provider" asp-items="@Model.ProvidersList" class="form-control"></select>
</div> </div>
<button type="submit" class="btn btn-primary" name="command" value="Save">Next</button> <button type="submit" class="btn btn-primary" name="command" value="Save">Next</button>
</form> </form>