aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-20 13:44:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removing csv jquery voodoo and using checkbox viewmodel mapping

Browse Source
This commit is contained in:
rockstardev
2020-06-13 19:19:21 -05:00
parent 09a72f2cfb
commit 0d876b9322
2 changed files with 61 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
BTCPayServer/Controllers/NotificationsController.cs
View File

@@ -74,20 +74,13 @@ namespace BTCPayServer.Controllers
}
[HttpPost]
public async Task<IActionResult> MassAction(string command, string csvGuids)
public async Task<IActionResult> MassAction(string command, string[] selectedItems)
{
List<string> parsedGuids = null;
try
{
parsedGuids = csvGuids.Split(',').ToList();
}
catch { }
if (parsedGuids != null)
if (selectedItems != null)
{
if (command == "delete" && validUserClaim(out var userId))
{
var toRemove = _db.Notifications.Where(a => a.ApplicationUserId == userId && parsedGuids.Contains(a.Id));
var toRemove = _db.Notifications.Where(a => a.ApplicationUserId == userId && selectedItems.Contains(a.Id));
_db.Notifications.RemoveRange(toRemove);
await _db.SaveChangesAsync();

115
BTCPayServer/Views/Notifications/Index.cshtml
View File

@@ -19,60 +19,66 @@
<hr class="primary">
</div>
</div>
<div class="row button-row">
<div class="col-lg-6">
<span class="dropdown" style="display:none;" id="MassAction">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Actions
</button>
<form method="post" asp-action="MassAction" class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@Html.Hidden("csvGuids")
<button type="submit" class="dropdown-item" name="command" value="delete"><i class="fa fa-trash-o"></i> Delete</button>
</form>
</span>
<a class="btn btn-primary" role="button" asp-action="Generate" id="Generate"><span class="fa fa-plus"></span> Generate Test Notification</a>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<table class="table table-sm table-responsive-md">
<thead>
<tr>
<th width="30px"></th>
<th width="165px">Date</th>
<th>Message</th>
<th width="80px">&nbsp;</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model.Items)
{
@* TODO: Multiselect akin to Gmail *@
<tr data-guid="@item.Id">
<td><input type="checkbox" class="selector" data-guid="@item.Id" /></td>
<td onclick="rowseen(this)" class="cursor-pointer @(item.Seen ? "": "font-weight-bold")">@item.Created.ToBrowserDate()</td>
<td onclick="rowseen(this)" class="cursor-pointer @(item.Seen ? "": "font-weight-bold")">@item.Body</td>
<td>
@if (!String.IsNullOrEmpty(item.ActionLink))
{
<a href="@item.ActionLink">Action <i class="fa fa-angle-double-right"></i></a>
}
else
{
<span>&nbsp;</span>
}
</td>
</tr>
}
</tbody>
</table>
<nav aria-label="...">
<ul class="pagination">
</ul>
</nav>
<form method="post" asp-action="MassAction">
<div class="row button-row">
<div class="col-lg-6">
<span class="dropdown" style="display:none;" id="MassAction">
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Actions
</button>
<div class="dropdown-menu">
<button type="submit" class="dropdown-item" name="command" value="delete"><i class="fa fa-trash-o"></i> Delete</button>
</div>
</span>
<a class="btn btn-primary" role="button" asp-action="Generate" id="Generate"><span class="fa fa-plus"></span> Generate Test Notification</a>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<table class="table table-sm table-responsive-md">
<thead>
<tr>
<th width="30px"></th>
<th width="165px">Date</th>
<th>Message</th>
<th width="80px">&nbsp;</th>
</tr>
</thead>
<tbody>
@foreach (var item in Model.Items)
{
<tr data-guid="@item.Id">
<td>
<input name="selectedItems" type="checkbox" class="selector" value="@item.Id" />
</td>
<td onclick="rowseen(this)" class="cursor-pointer @(item.Seen ? "": "font-weight-bold")">@item.Created.ToBrowserDate()</td>
<td onclick="rowseen(this)" class="cursor-pointer @(item.Seen ? "": "font-weight-bold")">@item.Body</td>
<td>
@if (!String.IsNullOrEmpty(item.ActionLink))
{
<a href="@item.ActionLink">Action <i class="fa fa-angle-double-right"></i></a>
}
else
{
<span>&nbsp;</span>
}
</td>
</tr>
}
</tbody>
</table>
<nav aria-label="...">
<ul class="pagination">
</ul>
</nav>
</div>
</div>
</form>
</div>
</section>
@@ -95,11 +101,6 @@
if (count > 0) {
$("#MassAction").children().eq(0).text("Batch Action (" + count + ")");
$("#MassAction").show();
var csvGuids = [];
$(".selector:checked").each(function () {
csvGuids.push($(this).data("guid"));
});
$("#csvGuids").val(csvGuids.join(","));
} else {
$("#MassAction").hide();
}