Author: Lars Michelsen <[email protected]>
Date: Wed Nov 23 21:07:22 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Wed Nov 23 21:07:22 2011 +0100
Using [service_description] as default value for label_text attribute
---
ChangeLog | 1 +
TODO | 2 --
share/server/core/classes/GlobalMapCfg.php | 2 +-
share/server/core/mapcfg/default.php | 20 ++++++++++++++------
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f866320..d084882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Core
during update
* Removed all old demo maps and created new ones using an the internal test
backend to be able to show a bit more details.
+ * Using [service_description] as default value for label_text attribute
Frontend
* Sorting maps by alias in header menu now
diff --git a/TODO b/TODO
index 6ab6776..07d81c9 100644
--- a/TODO
+++ b/TODO
@@ -11,8 +11,6 @@ Relative Koordinaten:
- Sidebar Folder auf/zu klappbar
- label_text Default bei Services soll auf [service_description] stehen
- Objekt klonen neu implementieren
-- 660 bei neuen Dateien
- - Eventuell auch eine Standard umask setzen
-------------------------------------------------------------------------------
diff --git a/share/server/core/classes/GlobalMapCfg.php
b/share/server/core/classes/GlobalMapCfg.php
index 894002c..9a84e3e 100644
--- a/share/server/core/classes/GlobalMapCfg.php
+++ b/share/server/core/classes/GlobalMapCfg.php
@@ -167,7 +167,7 @@ class GlobalMapCfg {
}
// Handle exceptions for services
- if($sVar != 'recognize_services') {
+ if($sVar != 'recognize_services' && $sVar != 'label_text') {
$this->typeDefaults['service'][$sVar] = $sTmp;
}
diff --git a/share/server/core/mapcfg/default.php
b/share/server/core/mapcfg/default.php
index 8d48971..4bc9305 100644
--- a/share/server/core/mapcfg/default.php
+++ b/share/server/core/mapcfg/default.php
@@ -496,11 +496,12 @@ $mapConfigVars = Array(
'field_type' => 'boolean',
),
'label_text' => Array(
- 'must' => 0,
- 'default' => '[name]',
- 'match' => MATCH_ALL,
- 'depends_on' => 'label_show',
- 'depends_value' => '1'),
+ 'must' => 0,
+ 'default' => '[name]',
+ 'match' => MATCH_ALL,
+ 'depends_on' => 'label_show',
+ 'depends_value' => '1'
+ ),
'label_x' => Array(
'must' => 0,
'default' => '-20',
@@ -636,6 +637,13 @@ $mapConfigVars = Array(
'field_type' => 'dropdown',
'list' => 'listServiceNames',
),
+ 'service_label_text' => Array(
+ 'must' => 0,
+ 'default' => '[service_description]',
+ 'match' => MATCH_ALL,
+ 'depends_on' => 'label_show',
+ 'depends_value' => '1'
+ ),
'service_url' => Array(
'must' => 0,
'default' => cfg('defaults', 'serviceurl'),
@@ -956,7 +964,7 @@ $mapConfigVarMap['service'] = Array(
'hover_childs_order' => null,
'hover_childs_limit' => null,
'label_show' => null,
- 'label_text' => null,
+ 'service_label_text' => 'label_text',
'label_x' => null,
'label_y' => null,
'label_width' => null,
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
