Fix a float operation in the progressbar code.

diff --git a/www/include/jquery.progressbar.min.js b/www/include/jquery.progressbar.min.js
index b891a0937ec2dbcd6ac3e4553a1d0fb7573c412b..c3cdc41460fa4ce48ec804b3091cc80601afced3 100644 (file)
--- a/www/include/jquery.progressbar.min.js
+++ b/www/include/jquery.progressbar.min.js
@@ -5,7 +5,7 @@ if(argconfig!=null)
 pb.config=$.extend(this.config,argconfig);config=pb.config;}else{var $this=$(this);var config=$.extend({},$.progressBar.defaults,argconfig);config.id=$this.attr('id')?$this.attr('id'):Math.ceil(Math.random()*100000);if(argvalue==null)
 argvalue=$this.html().replace("%","")
 config.value=argvalue;config.running_value=0;config.image=getBarImage(config);$this.html("");var bar=document.createElement('img');var text=document.createElement('span');var $bar=$(bar);var $text=$(text);pb.bar=$bar;$bar.attr('id',config.id+"_pbImage");$text.attr('id',config.id+"_pbText");$text.html(getText(config));$bar.attr('title',getText(config));$bar.attr('alt',getText(config));$bar.attr('src',config.boxImage);$bar.attr('width',config.width);$bar.css("width",config.width+"px");$bar.css("height",config.height+"px");$bar.css("background-image","url("+config.image+")");$bar.css("background-position",((config.width*-1))+'px 50%');$bar.css("padding","0");$bar.css("margin","0");$this.append($bar);$this.append($text);}
-function getPercentage(config){return config.running_value*100/config.max;}
+function getPercentage(config){return parseInt(config.running_value*100/config.max);}
 function getBarImage(config){var image=config.barImage;if(typeof(config.barImage)=='object'){for(var i in config.barImage){if(config.running_value>=parseInt(i)){image=config.barImage[i];}else{break;}}}
 return image;}
 function getText(config){if(config.showText){if(config.textFormat=='percentage'){return" "+Math.round(config.running_value)+"%";}else if(config.textFormat=='fraction'){return" "+config.running_value+'/'+config.max;}}}

diff --git a/www/pages/cluster/__init__.py b/www/pages/cluster/__init__.py
index 02acbc1d835e95e354114956eb11a2d847bc2f3a..2dd08e75e862352a2fd66aa8d5ff8cd0a60b08b9 100644 (file)
--- a/www/pages/cluster/__init__.py
+++ b/www/pages/cluster/__init__.py
@@ -37,13 +37,19 @@ page.javascript.jquery_plugin("progressbar")
 page.javascript.write("""<script type="text/javascript">
                                nodes = new Array();
                                id = 0;
+                               busy = false;
 
                                update = function() {
                                        $.getJSON("/rpc.py", { method: "cluster_get_info", id : id++ },
                                                function(data) {
+                                                       // If we are already busy then exit
+                                                       if (busy == true) return;
+
                                                        var count = 0;
 
                                                        if (data.error != "null") return;
+                                                       
+                                                       busy = true;
 
                                                        $.each(data.result.nodes, function(i, node) {
                                                                var nodeid = node.hostname.replace(/\./g, "");
@@ -83,6 +89,7 @@ page.javascript.write("""<script type="text/javascript">
                                                                }
                                                        }
                                                        $("#count").html(count);
+                                                       busy = false;
                                        });
                                }