vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

🆕Source Plugin Column

Browse Source
This commit is contained in:
jokob-sk
2024-10-19 12:03:20 +11:00
parent 4f859b5671
commit abd2f66814
19 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
front/devices.php
View File

@@ -456,7 +456,8 @@ function initializeDatatable (status) {
item.dev_GUID || "",
item.dev_SyncHubNodeName || "",
item.dev_NetworkSite || "",
item.dev_SSID || ""
item.dev_SSID || "",
item.dev_SourcePlugin || ""
];
var newRow = [];

6
front/php/server/devices.php
View File

@@ -620,7 +620,8 @@ function getDevicesList() {
array("dev_GUID", 19, 19),
array("dev_SyncHubNodeName", 20, 20),
array("dev_NetworkSite", 21, 21),
array("dev_SSID", 22, 22)
array("dev_SSID", 22, 22),
array("dev_SourcePlugin", 23, 23)
);
if($forceDefaultOrder == FALSE)
@@ -693,7 +694,8 @@ function getDevicesList() {
handleNull($row['dev_GUID']),
handleNull($row['dev_SyncHubNodeName']),
handleNull($row['dev_NetworkSite']),
handleNull($row['dev_SSID'])
handleNull($row['dev_SSID']),
handleNull($row['dev_SourcePlugin'])
);
$newOrder = array();

3
front/php/server/util.php
View File

@@ -576,7 +576,8 @@ function getDevicesColumns(){
"dev_GUID",
"dev_SyncHubNodeName",
"dev_NetworkSite",
"dev_SSID"
"dev_SSID",
"dev_SourcePlugin"
];
return $columns;

1
front/php/templates/language/ar_ar.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "",
"Device_TableHead_Rowid": "",
"Device_TableHead_SSID": "",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "",
"Device_TableHead_SyncHubNodeName": "",
"Device_TableHead_Type": "",

1
front/php/templates/language/cs_cz.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "",
"Device_TableHead_Rowid": "",
"Device_TableHead_SSID": "",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "",
"Device_TableHead_SyncHubNodeName": "",
"Device_TableHead_Type": "",

1
front/php/templates/language/de_de.json
View File

@@ -229,6 +229,7 @@
"Device_TableHead_RowID": "Zeilen ID",
"Device_TableHead_Rowid": "Zeilennummer",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Status",
"Device_TableHead_SyncHubNodeName": "Synchronisationsknoten",
"Device_TableHead_Type": "Typ",

1
front/php/templates/language/en_us.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "Row ID",
"Device_TableHead_Rowid": "Row ID",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "Source Plugin",
"Device_TableHead_Status": "Status",
"Device_TableHead_SyncHubNodeName": "Sync Node",
"Device_TableHead_Type": "Type",

1
front/php/templates/language/es_es.json
View File

@@ -227,6 +227,7 @@
"Device_TableHead_RowID": "Row ID",
"Device_TableHead_Rowid": "Row ID",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Situación",
"Device_TableHead_SyncHubNodeName": "Nodo de sincronización",
"Device_TableHead_Type": "Tipo",

1
front/php/templates/language/fr_fr.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "ID de colonne",
"Device_TableHead_Rowid": "ID de colonne",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "État",
"Device_TableHead_SyncHubNodeName": "Noeud de synchro",
"Device_TableHead_Type": "Type",

1
front/php/templates/language/it_it.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "ID riga",
"Device_TableHead_Rowid": "ID riga",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Stato",
"Device_TableHead_SyncHubNodeName": "Sincronizza nodo",
"Device_TableHead_Type": "Tipo",

1
front/php/templates/language/nb_no.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "Rad ID",
"Device_TableHead_Rowid": "Rad ID",
"Device_TableHead_SSID": "",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Status",
"Device_TableHead_SyncHubNodeName": "Synkroniser Node",
"Device_TableHead_Type": "Type",

1
front/php/templates/language/pl_pl.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "ID wiersza",
"Device_TableHead_Rowid": "ID wiersza",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Status",
"Device_TableHead_SyncHubNodeName": "Węzeł Synchronizacji",
"Device_TableHead_Type": "Typ",

1
front/php/templates/language/pt_br.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "ID da linha",
"Device_TableHead_Rowid": "ID da linha",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Status",
"Device_TableHead_SyncHubNodeName": "Nó de sincronização",
"Device_TableHead_Type": "Tipo",

1
front/php/templates/language/ru_ru.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "ID строки",
"Device_TableHead_Rowid": "ID строки",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Статус",
"Device_TableHead_SyncHubNodeName": "Узел синхронизации",
"Device_TableHead_Type": "Тип",

1
front/php/templates/language/tr_tr.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "",
"Device_TableHead_Rowid": "",
"Device_TableHead_SSID": "",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "Durum",
"Device_TableHead_SyncHubNodeName": "",
"Device_TableHead_Type": "",

1
front/php/templates/language/zh_cn.json
View File

@@ -217,6 +217,7 @@
"Device_TableHead_RowID": "排行",
"Device_TableHead_Rowid": "排行",
"Device_TableHead_SSID": "SSID",
"Device_TableHead_SourcePlugin": "",
"Device_TableHead_Status": "状态",
"Device_TableHead_SyncHubNodeName": "同步节点",
"Device_TableHead_Type": "类型",

6
front/plugins/ui_settings/config.json
View File

@@ -346,7 +346,8 @@
"Device_TableHead_Type",
"Device_TableHead_LastIP",
"Device_TableHead_Status",
"Device_TableHead_MAC_full"
"Device_TableHead_MAC_full",
"Device_TableHead_SourcePlugin"
],
"options": [
"Device_TableHead_Name",
@@ -371,7 +372,8 @@
"Device_TableHead_GUID",
"Device_TableHead_SyncHubNodeName",
"Device_TableHead_NetworkSite",
"Device_TableHead_SSID"
"Device_TableHead_SSID",
"Device_TableHead_SourcePlugin"
],
"localized": ["name", "description"],
"name": [

11
server/database.py
View File

@@ -213,6 +213,17 @@ class DB():
self.sql.execute("""
ALTER TABLE "Devices" ADD "dev_SyncHubNodeName" TEXT
""")
# dev_SourcePlugin column
dev_SourcePlugin_missing = self.sql.execute ("""
SELECT COUNT(*) AS CNTREC FROM pragma_table_info('Devices') WHERE name='dev_SourcePlugin'
""").fetchone()[0] == 0
if dev_SourcePlugin_missing :
mylog('verbose', ["[upgradeDB] Adding dev_SourcePlugin to the Devices table"])
self.sql.execute("""
ALTER TABLE "Devices" ADD "dev_SourcePlugin" TEXT
""")
# -------------------------------------------------------------------------
# Settings table setup

6
server/device.py
View File

@@ -229,7 +229,7 @@ def create_new_devices (db):
'{sanitize_SQL_input(get_setting_value('NEWDEV_dev_Location'))}'"""
# Fetch data from CurrentScan skipping ignored devices by IP and MAC
query = f"""SELECT cur_MAC, cur_Name, cur_Vendor, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type
query = f"""SELECT cur_MAC, cur_Name, cur_Vendor, cur_ScanMethod, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type
FROM CurrentScan """
@@ -237,7 +237,7 @@ def create_new_devices (db):
current_scan_data = sql.execute(query).fetchall()
for row in current_scan_data:
cur_MAC, cur_Name, cur_Vendor, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type = row
cur_MAC, cur_Name, cur_Vendor, cur_ScanMethod, cur_IP, cur_SyncHubNodeName, cur_NetworkNodeMAC, cur_PORT, cur_NetworkSite, cur_SSID, cur_Type = row
# Handle NoneType
cur_Name = cur_Name.strip() if cur_Name else '(unknown)'
@@ -262,6 +262,7 @@ def create_new_devices (db):
dev_NetworkSite,
dev_SSID,
dev_DeviceType,
dev_SourcePlugin,
{newDevColumns}
)
VALUES
@@ -279,6 +280,7 @@ def create_new_devices (db):
'{sanitize_SQL_input(cur_NetworkSite)}',
'{sanitize_SQL_input(cur_SSID)}',
'{sanitize_SQL_input(cur_Type)}',
'{sanitize_SQL_input(cur_ScanMethod)}',
{newDevDefaults}
)"""