Skip to content

Commit 4267a5c

Browse files
committed
FE+BE: Filters
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
1 parent 03a228e commit 4267a5c

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

front/php/templates/language/en_us.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
"Device_TableHead_NetworkSite": "Network Site",
249249
"Device_TableHead_Owner": "Owner",
250250
"Device_TableHead_ParentRelType": "Relationship Type",
251-
"Device_TableHead_Parent_MAC": "Parent network node",
251+
"Device_TableHead_Parent_MAC": "Parent node",
252252
"Device_TableHead_Port": "Port",
253253
"Device_TableHead_PresentLastScan": "Presence",
254254
"Device_TableHead_ReqNicsOnline": "Require NICs Online",

front/plugins/ui_settings/config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,7 @@
522522
"Device_TableHead_SSID",
523523
"Device_TableHead_SourcePlugin",
524524
"Device_TableHead_ParentRelType",
525+
"Device_TableHead_Parent_MAC",
525526
"Device_TableHead_Vlan"
526527
],
527528
"localized": ["name", "description"],

server/const.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@
9696
SELECT DISTINCT 'devVlan' AS columnName, devVlan AS columnValue
9797
FROM Devices WHERE devVlan NOT IN ('', 'null') AND devVlan IS NOT NULL
9898
UNION
99+
SELECT DISTINCT 'devParentMAC' AS columnName, devParentMAC AS columnValue
100+
FROM Devices WHERE devParentMAC NOT IN ('', 'null') AND devParentMAC IS NOT NULL
101+
UNION
99102
SELECT DISTINCT 'devParentRelType' AS columnName, devParentRelType AS columnValue
100103
FROM Devices WHERE devParentRelType NOT IN ('', 'null') AND devParentRelType IS NOT NULL
101104
UNION

0 commit comments

Comments
 (0)