Node mac address error fix

This commit is contained in:
Vitaly Kramskikh 2012-09-05 14:43:15 +04:00 committed by BeachHead Jenkins CI
parent 68c526790d
commit b59202d3ad
3 changed files with 2 additions and 5 deletions

View File

@ -64,9 +64,6 @@ define(function() {
response.new_roles = new models.Roles(response.new_roles);
return response;
},
mac: function() {
return this.id.replace(/^(..)(..)(..)(..)(..)(..)$/, "$1:$2:$3:$4:$5:$6");
},
fullProductName: function() {
return (this.get('manufacturer') ? this.get('manufacturer') + ' ' + this.get('platform_name') : this.get('platform_name')) || 'Unknown Platform';
},

View File

@ -7,7 +7,7 @@
</form>
<% } else { %>
<div class="node-name" style="<%= editingName ? 'display:none' : '' %>">
<h4 class="name"><i class="icon-pencil"></i><%= node.get('name') || node.mac() %></h4>
<h4 class="name"><i class="icon-pencil"></i><%= node.get('name') || node.get('mac') %></h4>
</div>
<% } %>
</div>

View File

@ -16,7 +16,7 @@
</div>
<% } %>
<ul>
<li class="macaddr"><%= node.mac() %></li>
<li class="macaddr"><%= node.get('mac') %></li>
</ul>
<ul>
<li>CPU: <%= _.isNumber(node.resource('cpu')) ? node.resource('cpu') : '?' %></li>