diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index d5ab0b73..56176cb5 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -248,7 +248,7 @@ "Device_TableHead_NetworkSite": "Network Site", "Device_TableHead_Owner": "Owner", "Device_TableHead_ParentRelType": "Relationship Type", - "Device_TableHead_Parent_MAC": "Parent network node", + "Device_TableHead_Parent_MAC": "Parent node", "Device_TableHead_Port": "Port", "Device_TableHead_PresentLastScan": "Presence", "Device_TableHead_ReqNicsOnline": "Require NICs Online", diff --git a/front/plugins/ui_settings/config.json b/front/plugins/ui_settings/config.json index b369bc26..df269290 100755 --- a/front/plugins/ui_settings/config.json +++ b/front/plugins/ui_settings/config.json @@ -522,6 +522,7 @@ "Device_TableHead_SSID", "Device_TableHead_SourcePlugin", "Device_TableHead_ParentRelType", + "Device_TableHead_Parent_MAC", "Device_TableHead_Vlan" ], "localized": ["name", "description"], diff --git a/server/const.py b/server/const.py index 1dc1e83b..1e554c9b 100755 --- a/server/const.py +++ b/server/const.py @@ -96,6 +96,9 @@ sql_devices_filters = """ SELECT DISTINCT 'devVlan' AS columnName, devVlan AS columnValue FROM Devices WHERE devVlan NOT IN ('', 'null') AND devVlan IS NOT NULL UNION + SELECT DISTINCT 'devParentMAC' AS columnName, devParentMAC AS columnValue + FROM Devices WHERE devParentMAC NOT IN ('', 'null') AND devParentMAC IS NOT NULL + UNION SELECT DISTINCT 'devParentRelType' AS columnName, devParentRelType AS columnValue FROM Devices WHERE devParentRelType NOT IN ('', 'null') AND devParentRelType IS NOT NULL UNION