Module: nagvis Branch: master Commit: 4c1fd22590fb72b031a8562ee9b430031b41bd6a URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis;a=commit;h=4c1fd22590fb72b031a8562ee9b430031b41bd6a
Author: Lars Michelsen <[email protected]> Date: Thu Sep 23 16:36:33 2010 +0200 Fixed line_label_show parameter - works now as expected --- share/frontend/nagvis-js/js/NagVisLine.js | 2 +- .../frontend/nagvis-js/js/NagVisStatefulObject.js | 2 +- share/server/core/classes/GlobalMapCfg.php | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/share/frontend/nagvis-js/js/NagVisLine.js b/share/frontend/nagvis-js/js/NagVisLine.js index 846f37b..b10419b 100644 --- a/share/frontend/nagvis-js/js/NagVisLine.js +++ b/share/frontend/nagvis-js/js/NagVisLine.js @@ -119,7 +119,7 @@ var NagVisLine = NagVisStatelessObject.extend({ drawNagVisLine(this.conf.object_id, this.conf.line_type, cuts, x[0], y[0], x[1], y[1], this.conf.z, width, colorFill, colorBorder, ((this.conf.url && this.conf.url !== '') || (this.conf.hover_menu && this.conf.hover_menu !== '')), - this.conf.line_label_show && this.conf.line_label_show !== ''); + this.conf.line_label_show && this.conf.line_label_show === '1'); }, parseHoverMenu: function () { diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js b/share/frontend/nagvis-js/js/NagVisStatefulObject.js index efadd70..272ac44 100644 --- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js +++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js @@ -578,7 +578,7 @@ var NagVisStatefulObject = NagVisObject.extend({ drawNagVisLine(this.conf.object_id, this.conf.line_type, cuts, x[0], y[0], x[1], y[1], this.conf.z, width, colorFill, colorFill2, setPerfdata, colorBorder, ((this.conf.url && this.conf.url !== '') || (this.conf.hover_menu && this.conf.hover_menu !== '')), - this.conf.line_label_show && this.conf.line_label_show !== ''); + this.conf.line_label_show && this.conf.line_label_show === '1'); }, /** diff --git a/share/server/core/classes/GlobalMapCfg.php b/share/server/core/classes/GlobalMapCfg.php index 9a1eacb..cfe6c2c 100644 --- a/share/server/core/classes/GlobalMapCfg.php +++ b/share/server/core/classes/GlobalMapCfg.php @@ -173,7 +173,7 @@ class GlobalMapCfg { 'header_fade' => Array('must' => 0, 'default' => $this->CORE->getMainCfg()->getValue('defaults', 'headerfade'), 'match' => MATCH_BOOLEAN, - 'field_type' => 'dropdown', + 'field_type' => 'boolean', 'depends_on' => 'header_menu', 'depends_value' => '1'), @@ -720,8 +720,9 @@ class GlobalMapCfg { 'depends_value' => 'line'), 'line_label_show' => Array( 'must' => 0, - 'default' => True, + 'default' => '1', 'match' => MATCH_BOOLEAN, + 'field_type' => 'boolean', 'depends_on' => 'view_type', 'depends_value' => 'line'), 'line_label_pos_in' => Array( ------------------------------------------------------------------------------ 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
