Merge branch 'development-v6' into fix/adlist_list

scripts/pi-hole/js/gravity.js

@@ -38,7 +38,6 @@ function eventsource() {
             return reader.read().then(({ done, value }) => {
               // When no more data needs to be consumed, close the stream
               if (done) {
-                ta.append("Done.");
                 controller.close();
                 alInfo.hide();
                 $("#gravityBtn").prop("disabled", false);
@@ -50,7 +49,7 @@ function eventsource() {
               var string = new TextDecoder().decode(value);
               parseLines(ta, string);
 
-              if (string.indexOf("Pi-hole blocking is") !== -1) {
+              if (string.indexOf("Done.") !== -1) {
                 alSuccess.show();
               }
 

scripts/pi-hole/js/groups-lists.js

@@ -85,7 +85,7 @@ function format(data) {
       : "N/A") +
     (data.abp_entries !== null && parseInt(data.abp_entries, 10) > 0 && numbers === true
       ? " (out of which " + parseInt(data.abp_entries, 10).toLocaleString() + " are in ABP-style)"
-      : "N/A") +
+      : "") +
     '</td></tr><tr class="dataTables-child"' +
     "><td>Number of non-domains on this list:&nbsp;&nbsp;</td>" +
     "<td>" +