135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#933 separate Duplex port info into running and configured columns

Browse Source
This commit is contained in:
Oliver Gorwits
2023-02-24 14:57:00 +00:00
parent 1ee2d13ce9
commit 4e6f143dec
4 changed files with 56 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/views/ajax/device/ports.tt
View File

@@ -177,12 +177,12 @@
<td>[% row.speed | html_entity %]</td>
[% END %]
[% IF params.c_duplex_admin %]
<td>[% row.duplex_admin.ucfirst | html_entity %]</td>
[% END %]
[% IF params.c_duplex %]
<td>
[% IF row.up == 'up' AND row.duplex %]
[% (row.duplex_admin.ucfirst || 'Auto') | html_entity %] / [% row.duplex.ucfirst | html_entity %]
[% END %]
</td>
<td>[% row.duplex.ucfirst | html_entity %]</td>
[% END %]
[% IF params.c_error %]

17
share/views/ajax/device/ports_csv.tt
View File

@@ -6,10 +6,7 @@
[% NEXT IF item.name == 'c_admin' %]
[% NEXT UNLESS params.${item.name} %]
[% IF item.name == 'c_duplex' %]
[% headers.push('Duplex Setting') %]
[% headers.push('Duplex') %]
[% ELSIF item.name == 'c_power' %]
[% IF item.name == 'c_power' %]
[% headers.push('PoE Status') %]
[% headers.push('PoE Power (mW)') %]
[% ELSIF item.name == 'c_nac_summary' %]
@@ -87,14 +84,12 @@
[% myport.push(row.speed) %]
[% END %]
[% IF params.c_duplex_admin %]
[% myport.push(row.duplex_admin.ucfirst) %]
[% END %]
[% IF params.c_duplex %]
[% IF row.up == 'up' AND row.duplex %]
[% myport.push( row.duplex_admin.ucfirst || 'Auto' ) %]
[% myport.push( row.duplex.ucfirst ) %]
[% ELSE %]
[% myport.push('') %]
[% myport.push('') %]
[% END %]
[% myport.push(row.duplex.ucfirst) %]
[% END %]
[% IF params.c_error %]