From 894ea0a8fa094b20deb3d6ca5cc12c9af7606ff2 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 29 Dec 2020 07:07:18 +0100
Subject: [PATCH] Open adlists in new tabs and allow sorting by status.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/groups-adlists.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index e7c9d054..3b036e68 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -68,7 +68,7 @@ function format(data) {
   }
 
   var invalidStyle =
-    data.invalid_domains !== null && numbers === true
+    data.invalid_domains !== null && data.invalid_domains > 0 && numbers === true
       ? ' style="color:red; font-weight:bold;"'
       : "";
 
@@ -93,12 +93,14 @@ function format(data) {
         ")"
       : "N/A") +
     '</td></tr><tr class="dataTables-child"><td>Number of valid domains on this list:&nbsp;&nbsp;</td><td>' +
-    (data.number !== null && numbers === true ? data.number : "N/A") +
+    (data.number !== null && numbers === true ? parseInt(data.number, 10) : "N/A") +
     '</td></tr><tr class="dataTables-child"' +
     invalidStyle +
     "><td>Number of invalid domains on this list:&nbsp;&nbsp;</td>" +
     "<td>" +
-    (data.invalid_domains !== null && numbers === true ? data.invalid_domains : "N/A") +
+    (data.invalid_domains !== null && numbers === true
+      ? parseInt(data.invalid_domains, 10)
+      : "N/A") +
     '</td></tr><tr class="dataTables-child"><td>Database ID of this list:</td><td>' +
     data.id +
     "</td></tr></table>"
@@ -115,7 +117,7 @@ function initTable() {
     order: [[0, "asc"]],
     columns: [
       { data: "id", visible: false },
-      { data: null, orderable: false, searchable: false, class: "details-control" },
+      { data: "status", searchable: false, class: "details-control" },
       { data: "address" },
       { data: "enabled", searchable: false },
       { data: "comment" },
@@ -172,7 +174,7 @@ function initTable() {
           data.id +
           '" class="breakall" href="' +
           data.address +
-          '">' +
+          '" target="_blank" rel="noopener noreferrer">' +
           data.address +
           "</a>"
       );