From b70af3cec73e06f91ff48aefc3209464163a43db Mon Sep 17 00:00:00 2001 From: Oliver Gorwits Date: Thu, 22 Feb 2018 07:35:10 +0000 Subject: [PATCH] add display of error to columns --- share/config.yml | 21 +++++++++++---------- share/views/ajax/device/ports.tt | 4 ++++ share/views/ajax/device/ports_csv.tt | 4 ++++ 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/share/config.yml b/share/config.yml index aaf6b982..94d02426 100644 --- a/share/config.yml +++ b/share/config.yml @@ -111,16 +111,17 @@ sidebar_defaults: c_lastchange: { label: 'Last Change', default: null, idx: 6 } c_name: { label: 'Name', default: checked, idx: 7 } c_speed: { label: 'Speed', default: null, idx: 8 } - c_mac: { label: 'Port MAC', default: null, idx: 9 } - c_mtu: { label: 'MTU', default: null, idx: 10 } - c_pvid: { label: 'Native VLAN', default: checked, idx: 11 } - c_vmember: { label: 'VLAN Membership', default: checked, idx: 12 } - c_power: { label: 'PoE', default: null, idx: 13 } - c_ssid: { label: 'SSID', default: null, idx: 14 } - c_nodes: { label: 'Connected Nodes', default: null, idx: 15 } - c_neighbors: { label: 'Connected Devices', default: checked, idx: 16 } - c_stp: { label: 'Spanning Tree', default: null, idx: 17 } - c_up: { label: 'Status', default: null, idx: 18 } + c_error: { label: 'Error Message', default: null, idx: 9 } + c_mac: { label: 'Port MAC', default: null, idx: 10 } + c_mtu: { label: 'MTU', default: null, idx: 11 } + c_pvid: { label: 'Native VLAN', default: checked, idx: 12 } + c_vmember: { label: 'VLAN Membership', default: checked, idx: 13 } + c_power: { label: 'PoE', default: null, idx: 14 } + c_ssid: { label: 'SSID', default: null, idx: 15 } + c_nodes: { label: 'Connected Nodes', default: null, idx: 16 } + c_neighbors: { label: 'Connected Devices', default: checked, idx: 17 } + c_stp: { label: 'Spanning Tree', default: null, idx: 18 } + c_up: { label: 'Status', default: null, idx: 19 } n_age: { label: 'Age Stamp', default: null, idx: 0 } n_ip4: { label: 'IPv4 Addresses', default: checked, idx: 1 } n_ip6: { label: 'IPv6 Addresses', default: checked, idx: 2 } diff --git a/share/views/ajax/device/ports.tt b/share/views/ajax/device/ports.tt index 7312cd3a..53a4355a 100644 --- a/share/views/ajax/device/ports.tt +++ b/share/views/ajax/device/ports.tt @@ -163,6 +163,10 @@ [% row.speed | html_entity %] [% END %] + [% IF params.c_error %] + [% row.error_disable_cause | html_entity %] + [% END %] + [% IF params.c_mac %] [% row.mac | html_entity %] [% END %] diff --git a/share/views/ajax/device/ports_csv.tt b/share/views/ajax/device/ports_csv.tt index 7f4db98f..8ed8aeb6 100644 --- a/share/views/ajax/device/ports_csv.tt +++ b/share/views/ajax/device/ports_csv.tt @@ -91,6 +91,10 @@ [% myport.push(row.speed) %] [% END %] + [% IF params.c_error %] + [% myport.push(row.error_disable_cause) %] + [% END %] + [% IF params.c_mac %] [% myport.push(row.mac) %] [% END %]