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

[#66] Fix display of vlan membership

Browse Source
This commit is contained in:
Oliver Gorwits
2014-01-11 09:44:35 +00:00
parent 1e0c6b9598
commit 862f2ba5b1
10 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Netdisco/share/views/ajax/device/ports.tt
View File

@@ -129,10 +129,10 @@
<td>[% row.mtu | html_entity %]</td>
[% END %]
[% IF params.c_vlan %]
[% IF params.c_pvid %]
[% IF user_can_port_control AND params.c_admin %]
<td class="nd_editable-cell" contenteditable="true" data-default="[% row.vlan | html_entity %]"
data-field="c_vlan" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
data-field="c_pvid" data-for-device="[% device.ip | html_entity %]" data-for-port="[% row.port | html_entity %]">
<i class="icon-edit nd_edit-icon"></i>
<div class="nd_editable-cell-content">
[% IF row.vlan %][% row.vlan | html_entity %][% END %]
@@ -149,17 +149,17 @@
[% IF params.c_vmember %]
<td>
[% IF row.tagged_vlans_count %]
[% IF row.vlan_count %]
[% SET output = '' %]
[% SET vlanlist = [] %]
[% FOREACH vlan IN row.tagged_vlans %][% vlanlist.push(vlan.vlan) %][% END %]
[% FOREACH vlan IN row.all_port_vlans %][% vlanlist.push(vlan.get_column('vlan')) %][% END %]
[% FOREACH vlan IN vlanlist.nsort %]
[% SET output = output _
'<a href="' _ uri_for('/search') _ '?tab=vlan&q=' _ vlan _ '">' _ vlan _ '</a>' %]
[% SET output = output _ ', ' IF NOT loop.last %]
[% END %]
[% IF row.tagged_vlans_count > 10 %] [%# TODO make this a settable variable %]
[% SET output = '<div class="nd_vlan-total">(' _ row.tagged_vlans_count
[% IF row.vlan_count > 10 %] [%# TODO make this a settable variable %]
[% SET output = '<div class="nd_vlan-total">(' _ row.vlan_count
_ ')</div><span class="nd_linkcell nd_collapse-vlans">
<div class="nd_arrow-up-down-left icon-chevron-up icon-large"></div>Show VLANs</span>
<div class="nd_collapsing nd_collapse-pre-hidden">' _ output %]

6
Netdisco/share/views/ajax/device/ports_csv.tt
View File

@@ -95,15 +95,15 @@
[% myport.push(row.mtu) %]
[% END %]
[% IF params.c_vlan %]
[% IF params.c_pvid %]
[% myport.push(row.vlan) %]
[% END %]
[% IF params.c_vmember %]
[% IF row.tagged_vlans_count %]
[% IF row.vlan_count %]
[% SET output = '' %]
[% SET vlanlist = [] %]
[% FOREACH vlan IN row.tagged_vlans %][% vlanlist.push(vlan.vlan) %][% END %]
[% FOREACH vlan IN row.all_port_vlans %][% vlanlist.push(vlan.get_column('vlan')) %][% END %]
[% FOREACH vlan IN vlanlist.nsort %]
[% SET output = output _ ',' IF NOT loop.first %]
[% SET output = output _ vlan %]

2
Netdisco/share/views/ajax/search/port.tt
View File

@@ -16,7 +16,7 @@
[% ' (' _ row.device.dns _ ')' IF row.device.dns %]
</td>
<td>[% row.descr | html_entity %]</td>
<td>[% row.vlan | html_entity %]</td>
<td>[% row.vlan | html_entity %]</td>
</tr>
[% END %]
</tbody>

2
Netdisco/share/views/ajax/search/port_csv.tt
View File

@@ -9,4 +9,4 @@
[% END %]
[% CSV.dump(mylist) %]
[% END %]
[% END %]