fe: fix CodisLabs#1167, can't get server addresses if sentinel is disabled

spinlock · spinlock · commit 6efabb8d5b22 · 2017-03-07T00:02:18.000+08:00
diff --git a/cmd/fe/assets/dashboard-fe.js b/cmd/fe/assets/dashboard-fe.js
@@ -548,6 +548,7 @@ function processGroupStats(codis_stats) {
                 x.canslaveof = "create";
                 x.actionstate = "";
             }
+            x.server_text = x.server;
         }
     }
     return {group_array: group_array, keys: keys, memory: memory};
@@ -685,7 +686,6 @@ dashboard.controller('MainCodisCtrl', ['$scope', '$http', '$uibModal', '$timeout
                     var ha_master_ingroup = false;
                     for (var j = 0; j < g.servers.length; j ++) {
                         var x = g.servers[j];
-                        x.server_text = x.server;
                         if (ha_master == undefined) {
                             x.ha_status = "ha_undefined";
                             continue;
diff --git a/cmd/fe/assets/index.html b/cmd/fe/assets/index.html
@@ -528,7 +528,7 @@ <h4 style="padding-left:30px; padding-right:20px; display: inline;">Group</h4>
                                     data-toggle="tooltip" data-placement="right" title="HA: SLAVE">
                                     [[server.server_text]]
                                 </span>
-                                <span ng-switch-when="ha_defined" style="color: white; background-color: darkgray"
+                                <span ng-switch-when="ha_undefined" style="color: white; background-color: darkgray"
                                     data-toggle="tooltip" data-placement="right" title="HA: UNDEFINED">
                                     [[server.server_text]]
                                 </span>

Original file line number	Diff line number	Diff line change
`@@ -548,6 +548,7 @@ function processGroupStats(codis_stats) {`
`548`	`548`	`x.canslaveof = "create";`
`549`	`549`	`x.actionstate = "";`
`550`	`550`	`}`
	`551`	`+ x.server_text = x.server;`
`551`	`552`	`}`
`552`	`553`	`}`
`553`	`554`	`return {group_array: group_array, keys: keys, memory: memory};`
`@@ -685,7 +686,6 @@ dashboard.controller('MainCodisCtrl', ['$scope', '$http', '$uibModal', '$timeout`
`685`	`686`	`var ha_master_ingroup = false;`
`686`	`687`	`for (var j = 0; j < g.servers.length; j ++) {`
`687`	`688`	`var x = g.servers[j];`
`688`		`- x.server_text = x.server;`
`689`	`689`	`if (ha_master == undefined) {`
`690`	`690`	`x.ha_status = "ha_undefined";`
`691`	`691`	`continue;`