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

Revert "[#23] Move to NetAddr::MAC for better handling of MACs"

Browse Source 
This reverts commit 562b3d26db.

Discovered a few unpolished bits of NetAddr::MAC, unfortunately. For example
$NetAddr::MAC::errstr is not reset when new instances are created.
This commit is contained in:
Oliver Gorwits
2014-05-28 23:23:08 +01:00
parent 97f68aaeb6
commit ba38f9e93d
12 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -55,9 +55,8 @@
<div class="clearfix">
<em class="muted">MAC address format:</em><br/>
<select id="nd_node-mac-format" name="mac_format">
[% FOREACH format IN mac_formats.keys.sort %]
<option[% ' selected="selected"' IF params.mac_format == format %]
value="[% format %]">[% mac_formats.$format %]</option>
[% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
<option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
[% END %]
</select>
</div>