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

[#162] Change from Net::MAC to NetAddr::MAC

Browse Source 
Note that IEEE and Microsoft are the WRONG WAY ROUND in NetAddr::MAC. I've
emailed the author about this. A dirty hack is in place to deal with it.
This commit is contained in:
Oliver Gorwits
2014-11-14 22:49:07 +00:00
parent e4c668fb12
commit a308d1a177
15 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Netdisco/share/views/sidebar/device/ports.tt
View File

@@ -125,9 +125,10 @@
<li>
<em class="muted">MAC address format:</em><br/>
<select id="nd_mac-format" name="mac_format">
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
<option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
[% END %]
<option[% ' selected="selected"' IF params.mac_format == 'Cisco' %]>Cisco</option>
<option[% ' selected="selected"' IF params.mac_format == 'Microsoft' %] value="Microsoft">IEEE</option>
<option[% ' selected="selected"' IF params.mac_format == 'IEEE' %] value="IEEE">Microsoft</option>
<option[% ' selected="selected"' IF params.mac_format == 'Sun' %]>Sun</option>
</select>
</li>
[% FOREACH item IN vars.connected_properties %]

7
Netdisco/share/views/sidebar/search/node.tt
View File

@@ -55,9 +55,10 @@
<div class="clearfix">
<em class="muted">MAC address format:</em><br/>
<select id="nd_node-mac-format" name="mac_format">
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
<option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
[% END %]
<option[% ' selected="selected"' IF params.mac_format == 'Cisco' %]>Cisco</option>
<option[% ' selected="selected"' IF params.mac_format == 'Microsoft' %] value="Microsoft">IEEE</option>
<option[% ' selected="selected"' IF params.mac_format == 'IEEE' %] value="IEEE">Microsoft</option>
<option[% ' selected="selected"' IF params.mac_format == 'Sun' %]>Sun</option>
</select>
</div>
<button id="[% tab.tag %]_submit" type="submit" class="btn btn-info">