diff --git a/share/views/ajax/device/ports_csv.tt b/share/views/ajax/device/ports_csv.tt index db7c6c1c..20643722 100644 --- a/share/views/ajax/device/ports_csv.tt +++ b/share/views/ajax/device/ports_csv.tt @@ -6,15 +6,7 @@ [% NEXT IF item.name == 'c_admin' %] [% NEXT UNLESS params.${item.name} %] - [% IF item.name == 'c_nodes' %] - [% SET c_nodes_pos = headers.size %] - [% headers.push('Node MAC') %] - [% headers.push('Archived Node') %] - [% headers.push('Age Stamp') IF params.n_age %] - [% headers.push('Node IP') IF params.n_ip4 OR params.n_ip6 %] - [% headers.push('Node DNS') IF params.n_ip4 OR params.n_ip6 %] - [% headers.push('Archived IP') IF params.n_ip4 OR params.n_ip6 %] - [% ELSIF item.name == 'c_duplex' %] + [% IF item.name == 'c_duplex' %] [% headers.push('Duplex Setting') %] [% headers.push('Duplex') %] [% ELSIF item.name == 'c_power' %] @@ -27,6 +19,14 @@ [% headers.push('PAE AuthSession User') %] [% headers.push('PAE AuthSession MAB') %] [% headers.push('PAE Last EAPOL Frame Source') %] + [% ELSIF item.name == 'c_nodes' %] + [% SET c_nodes_pos = headers.size %] + [% headers.push('Node MAC') %] + [% headers.push('Archived Node') %] + [% headers.push('Age Stamp') IF params.n_age %] + [% headers.push('Node IP') IF params.n_ip4 OR params.n_ip6 %] + [% headers.push('Node DNS') IF params.n_ip4 OR params.n_ip6 %] + [% headers.push('Archived IP') IF params.n_ip4 OR params.n_ip6 %] [% ELSIF item.name == 'c_neighbors' %] [% headers.push('Neighbor IP') %] [% headers.push('Neighbor DNS') %] @@ -42,28 +42,10 @@ [% FOREACH row IN results %] [% SET myport = [] %] - [% FOREACH config IN settings._extra_device_port_cols %] - [% NEXT UNLESS config.position == 'left' AND params.${config.name} %] - [% TRY %] - [% PROCESS "plugin/${config.name}/device_port_column_csv.tt" %] - [% CATCH %] - [% myport.push( row.get_column(config.field) ) %] - [% END %] - [% END %] - [% IF params.c_port %] [% myport.push(row.port) %] [% END %] - [% FOREACH config IN settings._extra_device_port_cols %] - [% NEXT UNLESS config.position == 'mid' AND params.${config.name} %] - [% TRY %] - [% PROCESS "plugin/${config.name}/device_port_column_csv.tt" %] - [% CATCH %] - [% myport.push( row.get_column(config.field) ) %] - [% END %] - [% END %] - [% IF params.c_descr %] [% myport.push(row.descr) %] [% END %] @@ -76,16 +58,6 @@ [% myport.push(row.type) %] [% 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 %] - [% END %] - [% IF params.c_ifindex %] [% myport.push(row.ifindex) %] [% END %] @@ -98,14 +70,33 @@ [% myport.push(row.name) %] [% END %] - [% IF params.c_speed %] - [% myport.push(row.speed) %] + [% FOREACH config IN settings._extra_device_port_cols %] + [% NEXT UNLESS config.position == 'left' AND params.${config.name} %] + [% TRY %] + [% PROCESS "plugin/${config.name}/device_port_column_csv.tt" %] + [% CATCH %] + [% myport.push( row.get_column(config.field) ) %] + [% END %] [% END %] [% IF params.c_speed_admin %] [% myport.push(row.speed_admin) %] [% END %] + [% IF params.c_speed %] + [% myport.push(row.speed) %] + [% 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 %] + [% END %] + [% IF params.c_error %] [% myport.push(row.error_disable_cause) %] [% END %] @@ -153,6 +144,15 @@ [% myport.push( row.pae_last_eapol_frame_source ) %] [% END %] + [% FOREACH config IN settings._extra_device_port_cols %] + [% NEXT UNLESS config.position == 'mid' AND params.${config.name} %] + [% TRY %] + [% PROCESS "plugin/${config.name}/device_port_column_csv.tt" %] + [% CATCH %] + [% myport.push( row.get_column(config.field) ) %] + [% END %] + [% END %] + [% IF params.c_nodes %] [% myport.push('') %] [% myport.push('') %]