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

Filter the apps by the user id

Browse Source
This commit is contained in:
nicolas.dorier
2019-04-12 14:54:59 +09:00
parent c55f1185e6
commit ae7ad9f667
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/HomeController.cs
View File

@@ -27,7 +27,7 @@ namespace BTCPayServer.Controllers
public async Task<IActionResult> Index() public async Task<IActionResult> Index()
{ {
if (_cachedServerSettings.RootAppType == Services.Apps.AppType.Crowdfund) if (_cachedServerSettings.RootAppType is Services.Apps.AppType.Crowdfund)
{ {
var serviceProvider = HttpContext.RequestServices; var serviceProvider = HttpContext.RequestServices;
var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController)); var controller = (AppsPublicController)serviceProvider.GetService(typeof(AppsPublicController));

12
BTCPayServer/Controllers/ServerController.cs
View File

@@ -451,11 +451,13 @@ namespace BTCPayServer.Controllers
// load display app dropdown // load display app dropdown
using (var ctx = _ContextFactory.CreateContext()) using (var ctx = _ContextFactory.CreateContext())
{ {
var selectList = ctx.Apps.Select(a => var userId = _UserManager.GetUserId(base.User);
new SelectListItem($"{a.AppType} - {a.Name}", a.Id) var selectList = ctx.Users.Where(user => user.Id == userId)
).ToList(); .SelectMany(s => s.UserStores)
.Select(s => s.StoreData)
.SelectMany(s => s.Apps)
.Select(a => new SelectListItem($"{a.AppType} - {a.Name}", a.Id)).ToList();
selectList.Insert(0, new SelectListItem("(None)", null)); selectList.Insert(0, new SelectListItem("(None)", null));
ViewBag.AppsList = new SelectList(selectList, "Value", "Text", data.RootAppId); ViewBag.AppsList = new SelectList(selectList, "Value", "Text", data.RootAppId);
} }
@@ -472,6 +474,8 @@ namespace BTCPayServer.Controllers
var app = ctx.Apps.SingleOrDefault(a => a.Id == settings.RootAppId); var app = ctx.Apps.SingleOrDefault(a => a.Id == settings.RootAppId);
if (app != null) if (app != null)
settings.RootAppType = Enum.Parse<AppType>(app.AppType); settings.RootAppType = Enum.Parse<AppType>(app.AppType);
else
settings.RootAppType = null;
} }
} }
else else