Module: nagvis Branch: master Commit: 5a800b48a30611dbd89409504a44cfe61ac2499b URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=5a800b48a30611dbd89409504a44cfe61ac2499b
Author: Lars Michelsen <[email protected]> Date: Sun Oct 31 23:55:34 2010 +0100 Not tollerating wrong datatypes of downtime/ack flags --- .../frontend/nagvis-js/js/NagVisStatefulObject.js | 8 ++++---- share/frontend/nagvis-js/js/frontend.js | 4 ++-- share/frontend/nagvis-js/js/hover.js | 12 ++++-------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js b/share/frontend/nagvis-js/js/NagVisStatefulObject.js index 980c73d..f317ed8 100644 --- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js +++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js @@ -128,7 +128,7 @@ var NagVisStatefulObject = NagVisObject.extend({ */ stateChangedToWorse: function() { var lastSubState = 'normal'; - if(this.last_state.summary_problem_has_been_acknowledged && this.last_state.summary_problem_has_been_acknowledged == 1) { + if(this.last_state.summary_problem_has_been_acknowledged && this.last_state.summary_problem_has_been_acknowledged === 1) { lastSubState = 'ack'; } else if(this.last_state.summary_in_downtime && this.last_state.summary_in_downtime == 1) { lastSubState = 'downtime'; @@ -142,9 +142,9 @@ var NagVisStatefulObject = NagVisObject.extend({ var lastWeight = oStates[this.last_state.summary_state][lastSubState]; var subState = 'normal'; - if(this.conf.summary_problem_has_been_acknowledged && this.conf.summary_problem_has_been_acknowledged == 1) { + if(this.conf.summary_problem_has_been_acknowledged && this.conf.summary_problem_has_been_acknowledged === 1) { subState = 'ack'; - } else if(this.conf.summary_in_downtime && this.conf.summary_in_downtime == 1) { + } else if(this.conf.summary_in_downtime && this.conf.summary_in_downtime === 1) { subState = 'downtime'; } @@ -570,7 +570,7 @@ var NagVisStatefulObject = NagVisObject.extend({ } // Get the border color depending on ack/downtime - if(this.conf.summary_problem_has_been_acknowledged == 1 || this.conf.summary_in_downtime == 1) { + if(this.conf.summary_problem_has_been_acknowledged === 1 || this.conf.summary_in_downtime === 1) { colorBorder = '#666666'; colorFill = lightenColor(colorFill, 100, 100, 100); } diff --git a/share/frontend/nagvis-js/js/frontend.js b/share/frontend/nagvis-js/js/frontend.js index ea7996d..97427df 100644 --- a/share/frontend/nagvis-js/js/frontend.js +++ b/share/frontend/nagvis-js/js/frontend.js @@ -516,9 +516,9 @@ function getFaviconImage(oObj) { var sFavicon; // Gather image on summary state of the object - if(oObj.summary_in_downtime && oObj.summary_in_downtime == '1') + if(oObj.summary_in_downtime && oObj.summary_in_downtime === 1) sFavicon = 'downtime'; - else if(oObj.summary_problem_has_been_acknowledged && oObj.summary_problem_has_been_acknowledged == '1') + else if(oObj.summary_problem_has_been_acknowledged && oObj.summary_problem_has_been_acknowledged === 1) sFavicon = 'ack'; else if(oObj.summary_state.toLowerCase() == 'unreachable') sFavicon = 'down'; diff --git a/share/frontend/nagvis-js/js/hover.js b/share/frontend/nagvis-js/js/hover.js index a718962..071b42c 100644 --- a/share/frontend/nagvis-js/js/hover.js +++ b/share/frontend/nagvis-js/js/hover.js @@ -133,20 +133,16 @@ function replaceHoverTemplateDynamicMacros(oObj) { oMacros.obj_state = oObj.conf.state; oMacros.obj_summary_state = oObj.conf.summary_state; - // FIXME: Need to use == instead of === cause there are some inconsistences - // in the PHP code somewhere. This should be cleaned up - if(oObj.conf.summary_problem_has_been_acknowledged && oObj.conf.summary_problem_has_been_acknowledged == 1) + if(oObj.conf.summary_problem_has_been_acknowledged && oObj.conf.summary_problem_has_been_acknowledged === 1) oMacros.obj_summary_acknowledged = '(Acknowledged)'; - // FIXME: Need to use == instead of === cause there are some inconsistences - // in the PHP code somewhere. This should be cleaned up - if(oObj.conf.problem_has_been_acknowledged && oObj.conf.problem_has_been_acknowledged == 1) + if(oObj.conf.problem_has_been_acknowledged && oObj.conf.problem_has_been_acknowledged === 1) oMacros.obj_acknowledged = '(Acknowledged)'; - if(oObj.conf.summary_in_downtime && oObj.conf.summary_in_downtime == 1) + if(oObj.conf.summary_in_downtime && oObj.conf.summary_in_downtime === 1) oMacros.obj_summary_in_downtime = '(Downtime)'; - if(oObj.conf.in_downtime && oObj.conf.in_downtime == 1) + if(oObj.conf.in_downtime && oObj.conf.in_downtime === 1) oMacros.obj_in_downtime = '(Downtime)'; oMacros.obj_output = oObj.conf.output; ------------------------------------------------------------------------------ Nokia and AT&T present the 2010 Calling All Innovators-North America contest Create new apps & games for the Nokia N8 for consumers in U.S. and Canada $10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store http://p.sf.net/sfu/nokia-dev2dev _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
