Merge pull request #1041 from VinceMacBuche/bug_3749/the_motherboard_…

…uuid_doesn_t_appear_on_the_inventory_on_a_node

Fixes #3749: The Motherboard UUID doesn't appear on the inventory on a Node

rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala

@@ -4,12 +4,12 @@
 *************************************************************************************
 *
 * This file is part of Rudder.
-* 
+*
 * Rudder is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
-* 
+*
 * In accordance with the terms of section 7 (7. Additional Terms.) of
 * the GNU General Public License version 3, the copyright holders add
 * the following Additional permissions:
@@ -22,12 +22,12 @@
 * documentation that, without modification of the Source Code, enables
 * supplementary functions or services in addition to those offered by
 * the Software.
-* 
+*
 * Rudder is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
-* 
+*
 * You should have received a copy of the GNU General Public License
 * along with Rudder.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -92,12 +92,10 @@ object DisplayNode extends Loggable {
     case Full(n) => n
   }
 
-
   private[this] val deleteNodePopupHtmlId = "deleteNodePopupHtmlId"
   private[this] val errorPopupHtmlId = "errorPopupHtmlId"
   private[this] val successPopupHtmlId = "successPopupHtmlId"
 
-
   private[this] def content() = chooseTemplate("serverdetails","content",template)
 
   private def loadSoftware(jsId:JsNodeId, softIds:Seq[SoftwareUuid])(nodeId:String):JsCmd = {
@@ -364,6 +362,7 @@ $$("#${detailsId}").bind( "show", function(event, ui) {
           <b>Manufacturer:</b> {sm.machine.flatMap(x => x.manufacturer).map(x => x.name).getOrElse("-")}<br/>
           <b>Total physical memory (RAM):</b> {sm.node.ram.map( _.toStringMo).getOrElse("-")}<br/>
           <b>Total swap space:</b> {sm.node.swap.map( _.toStringMo).getOrElse("-")}<br/>
+          <b>Motherboard UUID:</b> {sm.machine.map(_.id.value).getOrElse("-")}<br/>
           <b>System Serial Number:</b> {sm.machine.flatMap(x => x.systemSerialNumber).getOrElse("-")}<br/>
         </div>
 
@@ -396,7 +395,6 @@ $$("#${detailsId}").bind( "show", function(event, ui) {
         </div>
     </fieldset>
 
-
   }
 
   private def htmlId(jsId:JsNodeId, prefix:String="") : String = prefix + jsId.toString
@@ -536,7 +534,6 @@ $$("#${detailsId}").bind( "show", function(event, ui) {
     </div>
   }
 
-
   private def displayTabSoftware(jsId:JsNodeId) : NodeSeq =
     displayTabGrid(jsId)("soft",
         //do not retrieve software here
@@ -736,8 +733,6 @@ $$("#${detailsId}").bind( "show", function(event, ui) {
       </div>
     </div> ;
 
-
-
     SetHtml(deleteNodePopupHtmlId, popupHtml) &
     JsRaw(s""" createPopup("${deleteNodePopupHtmlId}") """)