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

Remove bugs reported by Rider

Browse Source
This commit is contained in:
nicolas.dorier
2020-04-05 12:30:23 +09:00
parent 963c69a0e0
commit 98e2baae19
5 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/BTCPayServer.csproj
View File

@@ -206,8 +206,6 @@
<Content Update="Views\Wallets\WalletTransactions.cshtml"> <Content Update="Views\Wallets\WalletTransactions.cshtml">
<Pack>$(IncludeRazorContentInPack)</Pack> <Pack>$(IncludeRazorContentInPack)</Pack>
</Content> </Content>
<Content Remove="Views\Server\EditGoogleCloudStorageStorageProvider.cshtml">
</Content>
<Content Update="Views\Wallets\_Nav.cshtml"> <Content Update="Views\Wallets\_Nav.cshtml">
<Pack>$(IncludeRazorContentInPack)</Pack> <Pack>$(IncludeRazorContentInPack)</Pack>
</Content> </Content>

17
BTCPayServer/Controllers/ManageController.2FA.cs
View File

@@ -162,23 +162,6 @@ namespace BTCPayServer.Controllers
return View(model); return View(model);
} }
[HttpGet]
public async Task<IActionResult> GenerateRecoveryCodesWarning()
{
var user = await _userManager.GetUserAsync(User);
if (user == null)
{
throw new ApplicationException($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
}
if (!user.TwoFactorEnabled)
{
throw new ApplicationException($"Cannot generate recovery codes for user with ID '{user.Id}' because they do not have 2FA enabled.");
}
return View(nameof(GenerateRecoveryCodesWarning));
}
private string GenerateQrCodeUri(string email, string unformattedKey) private string GenerateQrCodeUri(string email, string unformattedKey)
{ {
return string.Format(CultureInfo.InvariantCulture, return string.Format(CultureInfo.InvariantCulture,

2
BTCPayServer/Controllers/ManageController.cs
View File

@@ -149,7 +149,7 @@ namespace BTCPayServer.Controllers
{ {
if (!ModelState.IsValid) if (!ModelState.IsValid)
{ {
return View(model); return View(nameof(Index), model);
} }
var user = await _userManager.GetUserAsync(User); var user = await _userManager.GetUserAsync(User);

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

@@ -73,9 +73,13 @@
{ {
var skip = Model.Skip; var skip = Model.Skip;
if (prevNext == -1) if (prevNext == -1)
{
skip = Math.Max(0, Model.Skip - Model.Count); skip = Math.Max(0, Model.Skip - Model.Count);
}
else if (prevNext == 1) else if (prevNext == 1)
{
skip = Model.Skip + count; skip = Model.Skip + count;
}
var act = Url.Action("ListUsers", new var act = Url.Action("ListUsers", new
{ {

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

@@ -1,10 +1,10 @@
<div class="nav flex-column nav-pills"> <div class="nav flex-column nav-pills">
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Users)" asp-action="Users">Users</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Users)" asp-action="ListUsers">Users</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Emails)" asp-action="Emails">Email server</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Emails)" asp-action="Emails">Email server</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Policies)" asp-action="Policies">Policies</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Policies)" asp-action="Policies">Policies</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Services)" asp-action="Services">Services</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Services)" asp-action="Services">Services</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Theme)" asp-action="Theme">Theme</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Theme)" asp-action="Theme">Theme</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Maintenance)" asp-action="Maintenance">Maintenance</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Maintenance)" asp-action="Maintenance">Maintenance</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Logs)" asp-action="Logs">Logs</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Logs)" asp-action="LogsView">Logs</a>
<a class="nav-link @ViewData.IsActivePage(ServerNavPages.Files)" asp-action="Files">Files</a> <a class="nav-link @ViewData.IsActivePage(ServerNavPages.Files)" asp-action="Files">Files</a>
</div> </div>