Merge pull request #122 from ncharles/bug_3278/dev/correct_accept_new…

…_node Fixes #3278 : correct display of table accept new nodes
Normation · Feb 18, 2013 · 3b071fa · 3b071fa
2 parents 1425cd5 + 1a8f705
commit 3b071fa
Showing 1 changed file with 2 additions and 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
@@ -213,11 +213,10 @@ class NodeGrid(getNodeAndMachine:LDAPFullInventoryRepository) extends Loggable {
       "header" -> (columns flatMap { c => <th>{c._1}<span/></th> }),
       "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 => <div class="ip">{ip}</div> }) & // TODO : enhance this
-         ".other" #> (columns flatMap { c => <td style="overflow:hidden">{c._2(s)}</td> }) &
+         ".ips *" #> ( (ips.flatMap{ ip => <div class="ip">{ip}</div> }):NodeSeq ) & // TODO : enhance this
+         ".other" #> ( (columns flatMap { c => <td style="overflow:hidden">{c._2(s)}</td> }):NodeSeq ) &
          ".nodetr [jsuuid]" #> {id.value.replaceAll("-","")} &
          ".nodetr [nodeid]" #> {id.value} &
          ".nodetr [nodestatus]" #> {status.name}