Merge pull request #556 from VinceMacBuche/bug_5092/display_role_on_a…

…llnodes Fixes #5092: Display correctly nodes roles if they have one
Normation · Jun 20, 2014 · 62eebf1 · 62eebf1
2 parents 03fbb1a + 6012cb7
commit 62eebf1
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
@@ -397,23 +397,30 @@ def jsInit(nodeId:NodeId, softIds:Seq[SoftwareUuid], salt:String="", tabContaine
         val nodeInfoBox = nodeInfoService.getNodeInfo(nodeId)
         nodeInfoBox match {
           case Full(nodeInfo) =>
-            if(nodeInfo.isPolicyServer) {
-              if(isRootNode(nodeId) ) {
-                val roles = if(nodeInfo.serverRoles.isEmpty) {
-                  ""
+
+            val kind = {
+              if(nodeInfo.isPolicyServer) {
+                if(isRootNode(nodeId) ) {
+                  "server"
                 } else {
-                  nodeInfo.serverRoles.map(_.value).mkString(" (", ", ", ")")
+                  "relay server"
+                }
+              } else {
+                if (nodeInfo.serverRoles.isEmpty){
+                  "node"
+                } else {
+                  "server component"
                 }
-
-                <span><b>Role: </b>Rudder server{roles}</span><br/>
-
-              } else { //server relay, don't take care of nodes
-                <span><b>Role: </b>Rudder relay server</span><br/>
               }
+            }
+
+            val roles = if (nodeInfo.serverRoles.isEmpty) {
+              ""
             } else {
-              <span><b>Role: </b>Rudder node</span><br/>
+              nodeInfo.serverRoles.map(_.value).mkString("(",", ",")")
             }
 
+            <span><b>Role: </b>Rudder {kind} {roles}</span><br/>
           case eb:EmptyBox =>
             val e = eb ?~! s"Could not fetch node details for node with id ${sm.node.main.id}, no cause given"
             logger.error(e.messageChain)