Improvements to banlist sorting

Thanks to Vitaly for reporting the issue!
This commit is contained in:
Wruczek 2017-01-19 19:43:28 +01:00
parent bc77129f94
commit 9f21e838c7
2 changed files with 6 additions and 4 deletions

View File

@ -84,8 +84,10 @@ function getBanlist() {
$reason = $ban['reason']; $reason = $ban['reason'];
$invokername = $ban['invokername']->toString(); $invokername = $ban['invokername']->toString();
$created = date('d-m-Y H:i:s', $ban['created']);
$duration = $ban['duration']; $duration = $ban['duration'];
$createdepoch = $ban['created'];
$expiresepoch = $ban['created'] + $duration;
$created = date('d-m-Y H:i:s', $createdepoch);
if (empty($reason)) if (empty($reason))
$reason = "<b>" . translate($lang["banlist"]["table"]["emptyreason"]) . "</b>"; $reason = "<b>" . translate($lang["banlist"]["table"]["emptyreason"]) . "</b>";
@ -93,9 +95,9 @@ function getBanlist() {
if ($duration == 0) if ($duration == 0)
$expires = translate($lang["banlist"]["table"]["permaban"]); $expires = translate($lang["banlist"]["table"]["permaban"]);
else else
$expires = date('d-m-Y H:i:s', $ban['created'] + $duration); $expires = date('d-m-Y H:i:s', $expiresepoch);
$output .= "<tr><td>$user</td><td>$reason</td><td>$invokername</td><td>$created</td><td>$expires</td></tr>"; $output .= "<tr><td>$user</td><td>$reason</td><td>$invokername</td><td data-order=\"$createdepoch\">$created</td><td data-order=\"$expiresepoch\">$expires</td></tr>";
} }
return $output; return $output;

View File

@ -1,6 +1,6 @@
$(document).ready(function () { $(document).ready(function () {
$('#banlist').dataTable({ $('#banlist').dataTable({
"order": [], "order": [[3, "desc"]],
"language": { "language": {
"url": datatablesUrl "url": datatablesUrl
} }