From 1a8f705cb9818dca69d53884c3406a2a9e595cc2 Mon Sep 17 00:00:00 2001 From: Nicolas Charles Date: Mon, 18 Feb 2013 15:12:30 +0100 Subject: [PATCH] Fixes #3278 : correct display of table accept new nodes --- .../scala/com/normation/rudder/web/services/NodeGrid.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala index 02b0129ce4c..4313928296e 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/services/NodeGrid.scala @@ -213,11 +213,10 @@ class NodeGrid(getNodeAndMachine:LDAPFullInventoryRepository) extends Loggable { "header" -> (columns flatMap { c => {c._1} }), "lines" -> ( servers.flatMap { case s@Srv(id,status, hostname,ostype,osname,osFullName,ips,creationDate) => //build all table lines - (".hostname *" #> {(if(isEmpty(hostname)) "(Missing host name) " + id.value else hostname)} & ".fullos *" #> osFullName & - ".ips *" #> (ips.flatMap{ ip =>
{ip}
}) & // TODO : enhance this - ".other" #> (columns flatMap { c => {c._2(s)} }) & + ".ips *" #> ( (ips.flatMap{ ip =>
{ip}
}):NodeSeq ) & // TODO : enhance this + ".other" #> ( (columns flatMap { c => {c._2(s)} }):NodeSeq ) & ".nodetr [jsuuid]" #> {id.value.replaceAll("-","")} & ".nodetr [nodeid]" #> {id.value} & ".nodetr [nodestatus]" #> {status.name}