Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2014-03-03 14:13:43 +01:00
parent 24f98d69db e922021940
commit 5af6f55f9c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/Windows/Templates/NSIS.InstallOptions.ini.in
View File

@ -20,7 +20,7 @@ State=1
[Field 3]
Type=radiobutton
Text=Install @CPACK_PACKAGE_NAME@ as into configurable directory
Text=Install @CPACK_PACKAGE_NAME@ as into configurable directory
Left=0
Right=-1
Top=40

10
js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
View File

@ -109,10 +109,16 @@
updateServerStatus: function() {
console.log(this.dbservers.url);
this.dbservers.getStatuses(function(stat, serv) {
$("#" + serv.replace(":", "\\:")).attr("class", "dbserver " + stat);
var id = serv.replace(":", "\\:"),
type;
type = $("#" + id).attr("class").split(/\s+/)[1];
$("#" + id).attr("class", "dbserver " + type + " " + stat);
});
this.coordinators.getStatuses(function(stat, serv) {
$("#" + serv.replace(":", "\\:")).attr("class", "coordinator " + stat);
var id = serv.replace(":", "\\:"),
type;
type = $("#" + id).attr("class").split(/\s+/)[1];
$("#" + id).attr("class", "coordinator " + type + " " + stat);
});
},