Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Feb 3, 2016
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/>.

Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -396,7 +395,6 @@ $$("#${detailsId}").bind( "show", function(event, ui) {
</div>
</fieldset>


}

private def htmlId(jsId:JsNodeId, prefix:String="") : String = prefix + jsId.toString
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -736,8 +733,6 @@ $$("#${detailsId}").bind( "show", function(event, ui) {
</div>
</div> ;



SetHtml(deleteNodePopupHtmlId, popupHtml) &
JsRaw(s""" createPopup("${deleteNodePopupHtmlId}") """)

Expand Down