Author: Lars Michelsen <[email protected]>
Date: Fri Feb 10 11:48:48 2012 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Fri Feb 10 11:48:48 2012 +0100
he label_show parameter can now be configured for the whole installation
in the [defaults] section of the main configuration
---
ChangeLog | 2 ++
docs/en_US/nagvis_config_format_description.html | 5 +++++
share/server/core/classes/GlobalMainCfg.php | 10 +++++++++-
share/server/core/mapcfg/default.php | 1 +
4 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2772daf..16d844a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@ Core
socket timeout while connecting to the livestatus socket
* Livestatus Backend: Only try to connect to livestatus once per page load
* FIX: Fixed wrong computed shape urls which broke all shapes
+ * The label_show parameter can now be configured for the whole installation
+ in the [defaults] section of the main configuration
Frontend
* Weathermap line color definitions support usage values above 100% and
below 0%
diff --git a/docs/en_US/nagvis_config_format_description.html
b/docs/en_US/nagvis_config_format_description.html
index 7b6971b..ba7f5aa 100644
--- a/docs/en_US/nagvis_config_format_description.html
+++ b/docs/en_US/nagvis_config_format_description.html
@@ -343,6 +343,11 @@
<td>default</td>
<td>Templates to be used for the different views.</td>
</tr>
+ <tr>
+ <td>label_show</td>
+ <td>0</td>
+ <td><font color="#ff0000">New in 1.6.4:</font> Show the objects
labels or not.</td>
+ </tr>
</table>
<a name="index"></a>
diff --git a/share/server/core/classes/GlobalMainCfg.php
b/share/server/core/classes/GlobalMainCfg.php
index 399f329..e0e7791 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -394,7 +394,15 @@ class GlobalMainCfg {
'must' => 0,
'editable' => 1,
'default' => 'default',
- 'match' => MATCH_STRING_NO_SPACE),
+ 'match' => MATCH_STRING_NO_SPACE
+ ),
+ 'label_show' => Array(
+ 'must' => 0,
+ 'editable' => 1,
+ 'default' => '0',
+ 'match' => MATCH_BOOLEAN,
+ 'field_type' => 'boolean',
+ ),
),
'wui' => Array(
'allowedforconfig' => Array(
diff --git a/share/server/core/mapcfg/default.php
b/share/server/core/mapcfg/default.php
index 944efd0..769cbad 100644
--- a/share/server/core/mapcfg/default.php
+++ b/share/server/core/mapcfg/default.php
@@ -503,6 +503,7 @@ $mapConfigVars = Array(
'label_show' => Array(
'must' => 0,
'default' => '0',
+ 'default' => cfg('defaults', 'label_show'),
'match' => MATCH_BOOLEAN,
'field_type' => 'boolean',
),
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
