Merge pull request #1721 from pi-hole/master

Sync after web v5.3.2 release
pi-hole · Jan 27, 2021 · 6ff083a · 6ff083a
2 parents 35e6c83 + 1521dfe
commit 6ff083a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
@@ -98,7 +98,7 @@ function getQueryTypes() {
   }
 
   if ($("#type_forwarded").prop("checked")) {
-    queryType.push(2);
+    queryType.push([2, 14]);
   }
 
   if ($("#type_cached").prop("checked")) {
@@ -272,6 +272,12 @@ $(function () {
           fieldtext = "Retried <br class='hidden-lg'>(ignored)";
           buttontext = "";
           break;
+        case 14:
+          color = "green";
+          fieldtext = "OK <br class='hidden-lg'>(already forwarded)";
+          buttontext =
+            '<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
+          break;
         default:
           color = "black";
           fieldtext = "Unknown";

diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
@@ -195,6 +195,12 @@ $(function () {
           fieldtext = "Retried <br class='hidden-lg'>(ignored)";
           buttontext = "";
           break;
+        case "14":
+          colorClass = "text-green";
+          fieldtext = "OK <br class='hidden-lg'>(already forwarded)" + dnssecStatus;
+          buttontext =
+            '<button type="button" class="btn btn-default btn-sm text-red"><i class="fa fa-ban"></i> Blacklist</button>';
+          break;
         default:
           colorClass = false;
           fieldtext = "Unknown (" + parseInt(data[4], 10) + ")";