Skip to content

Commit 79a9e9f

Browse files
authored
Merge pull request #1610 from netalertx/next_release
FIX: Add 'No Data' message for empty plugin tabs and enhance event da…
2 parents 36174a8 + b0c687a commit 79a9e9f

25 files changed

Lines changed: 55 additions & 15 deletions

front/deviceDetailsEvents.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<script>
3232

3333
function loadEventsData() {
34+
const mac = getMac();
35+
if (!mac) {
36+
console.warn("loadEventsData: mac not set, skipping");
37+
return;
38+
}
39+
3440
const hideConnections = $('#chkHideConnectionEvents')[0].checked;
3541

3642
let period = $("#period").val();
@@ -65,7 +71,7 @@ function loadEventsData() {
6571
query,
6672
variables: {
6773
options: {
68-
eveMac: mac,
74+
eveMac: mac, // local const from getMac() above
6975
dateFrom: start,
7076
dateTo: end,
7177
limit: 500,
@@ -163,6 +169,11 @@ function initDeviceEventsPage()
163169
return; // exit early if nothing is visible
164170
}
165171

172+
// Only proceed if mac is available
173+
if (!getMac()) {
174+
return; // exit early if mac is not yet set
175+
}
176+
166177
// init page once
167178
if (eventsPageInitialized) return; // ENSURE ONCE
168179
eventsPageInitialized = true;

front/php/templates/language/ar_ar.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "قاعدة البيانات مقفلة",
345345
"Gen_NetworkMask": "قناع الشبكة",
346346
"Gen_New": "",
347+
"Gen_No_Data": "",
347348
"Gen_Offline": "غير متصل",
348349
"Gen_Okay": "موافق",
349350
"Gen_Online": "متصل",
@@ -805,4 +806,4 @@
805806
"settings_system_label": "نظام",
806807
"settings_update_item_warning": "قم بتحديث القيمة أدناه. احرص على اتباع التنسيق السابق. <b>لم يتم إجراء التحقق.</b>",
807808
"test_event_tooltip": "احفظ التغييرات أولاً قبل اختبار الإعدادات."
808-
}
809+
}

front/php/templates/language/ca_ca.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "ERROR - DB podria estar bloquejada - Fes servir F12 Eines desenvolupament -> Consola o provar-ho més tard.",
345345
"Gen_NetworkMask": "Màscara de xarxa",
346346
"Gen_New": "Nou",
347+
"Gen_No_Data": "",
347348
"Gen_Offline": "Fora de línia",
348349
"Gen_Okay": "Ok",
349350
"Gen_Online": "En línia",
@@ -805,4 +806,4 @@
805806
"settings_system_label": "Sistema",
806807
"settings_update_item_warning": "Actualitza el valor sota. Sigues curós de seguir el format anterior. <b>No hi ha validació.</b>",
807808
"test_event_tooltip": "Deseu els canvis primer abans de comprovar la configuració."
808-
}
809+
}

front/php/templates/language/cs_cz.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "CHYBA - Databáze je možná zamčená - Zkontrolujte F12 -> Nástroje pro vývojáře -> Konzole. nebo to zkuste později.",
345345
"Gen_NetworkMask": "",
346346
"Gen_New": "",
347+
"Gen_No_Data": "",
347348
"Gen_Offline": "Offline",
348349
"Gen_Okay": "Ok",
349350
"Gen_Online": "Online",

front/php/templates/language/de_de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,7 @@
348348
"Gen_LockedDB": "ERROR - DB eventuell gesperrt - Nutze die Konsole in den Entwickler Werkzeugen (F12) zur Überprüfung oder probiere es später erneut.",
349349
"Gen_NetworkMask": "Netzmaske",
350350
"Gen_New": "Neu",
351+
"Gen_No_Data": "",
351352
"Gen_Offline": "Offline",
352353
"Gen_Okay": "Ok",
353354
"Gen_Online": "Online",
@@ -878,4 +879,4 @@
878879
"settings_system_label": "System",
879880
"settings_update_item_warning": "",
880881
"test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen."
881-
}
882+
}

front/php/templates/language/en_us.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "ERROR - DB might be locked - Check F12 Dev tools -> Console or try later.",
345345
"Gen_NetworkMask": "Network mask",
346346
"Gen_New": "New",
347+
"Gen_No_Data": "No data",
347348
"Gen_Offline": "Offline",
348349
"Gen_Okay": "Ok",
349350
"Gen_Online": "Online",

front/php/templates/language/es_es.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@
346346
"Gen_LockedDB": "Fallo - La base de datos puede estar bloqueada - Pulsa F1 -> Ajustes de desarrolladores -> Consola o prueba más tarde.",
347347
"Gen_NetworkMask": "Máscara de red",
348348
"Gen_New": "",
349+
"Gen_No_Data": "",
349350
"Gen_Offline": "Desconectado",
350351
"Gen_Okay": "Aceptar",
351352
"Gen_Online": "En linea",
@@ -876,4 +877,4 @@
876877
"settings_system_label": "Sistema",
877878
"settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. <b>O la validación no se realiza.</b>",
878879
"test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes."
879-
}
880+
}

front/php/templates/language/fa_fa.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "",
345345
"Gen_NetworkMask": "",
346346
"Gen_New": "",
347+
"Gen_No_Data": "",
347348
"Gen_Offline": "",
348349
"Gen_Okay": "",
349350
"Gen_Online": "",

front/php/templates/language/fi_fi.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "",
345345
"Gen_NetworkMask": "",
346346
"Gen_New": "",
347+
"Gen_No_Data": "",
347348
"Gen_Offline": "",
348349
"Gen_Okay": "",
349350
"Gen_Online": "",

front/php/templates/language/fr_fr.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@
344344
"Gen_LockedDB": "Erreur - La base de données est peut-être verrouillée - Vérifier avec les outils de dév via F12 -> Console ou essayer plus tard.",
345345
"Gen_NetworkMask": "Masque réseau",
346346
"Gen_New": "Nouveau",
347+
"Gen_No_Data": "",
347348
"Gen_Offline": "Hors ligne",
348349
"Gen_Okay": "OK",
349350
"Gen_Online": "En ligne",
@@ -805,4 +806,4 @@
805806
"settings_system_label": "Système",
806807
"settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. <b>Il n'y a pas de pas de contrôle.</b>",
807808
"test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage."
808-
}
809+
}

0 commit comments

Comments
 (0)