Author: Lars Michelsen <[email protected]>
Date: Sun Nov 27 19:59:56 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun Nov 27 19:59:56 2011 +0100
automap: Finally removed the deprecated option maxLayers. Use childLayers
instead.
---
ChangeLog | 3 +++
docs/de_DE/automap.html | 3 ---
docs/de_DE/nagvis_config_format_description.html | 4 ++--
docs/en_US/automap.html | 3 ---
docs/en_US/nagvis_config_format_description.html | 2 +-
.../nagvis-js/classes/FrontendModAutoMap.php | 1 -
share/server/core/classes/CoreModAutoMap.php | 1 -
share/server/core/classes/NagVisAutoMap.php | 7 -------
.../core/classes/NagVisViewAutomapModifyParams.php | 1 -
9 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 753761c..92aca7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,9 @@ Frontend
* Bugfix: Removing just dragged new lines before opening the add/modify
dialog
* Bugfix: Not terminating map rename when one map contains a syntax error
+Automap
+ * Finally removed the deprecated option maxLayers. Use childLayers instead.
+
1.6rc4
Core
* Bugfix: Fixed inclusion problem of default settings in some rare cases
diff --git a/docs/de_DE/automap.html b/docs/de_DE/automap.html
index 5151e6e..b37ac3b 100644
--- a/docs/de_DE/automap.html
+++ b/docs/de_DE/automap.html
@@ -66,9 +66,6 @@
<td> root </td><td> siehe <a href="#root/object/definition">root
object definition</a></td><td>Dies ist der Name des Root-Objektes. Es ist nicht
notwendig, den Host hier zu setzen. Es gibt mehrere Wege, das Root-Objekt zu
ermitteln. Einzelheiten finden Sie im <a
href=#Root-Objekt-Definition>Root-Objekt-Definition</a>-Kapitel auf dieser
Seite</td>
</tr>
<tr>
- <td> maxLayers </td><td> 2 </td><td> Diese Option ist veraltet.
Nutzen Sie statt dessen childLayers (s.u.) </td>
- </tr>
- <tr>
<td> childLayers </td><td> 2 </td><td> maximale Anzahl von
anzuzeigenden Ebenen abhängiger "Child"-Hosts.</td>
</tr>
<tr>
diff --git a/docs/de_DE/nagvis_config_format_description.html
b/docs/de_DE/nagvis_config_format_description.html
index 7e69be9..3a6d37f 100644
--- a/docs/de_DE/nagvis_config_format_description.html
+++ b/docs/de_DE/nagvis_config_format_description.html
@@ -352,14 +352,14 @@
showinlists=1
defaultroot="localhost"
graphvizpath="/usr/local/bin"
- defaultparams="&maxLayers=2"</pre>
+ defaultparams="&childLayers=2"</pre>
-->
<table border=0 style="width:100%">
<tr>
<th width="200">Wert</th><th
width="150">Default</th><th>Beschreibung</th>
</tr>
<tr>
- <td>defaultparams</td><td>&maxLayers=2</td><td>Dies sind die
Parameter für die Automap-Ansichten und Links in den Listen
(Map-Indexseite, Dropdown-Menüs in den Headern)</td>
+ <td>defaultparams</td><td>&childLayers=2</td><td>Dies sind die
Parameter für die Automap-Ansichten und Links in den Listen
(Map-Indexseite, Dropdown-Menüs in den Headern)</td>
</tr>
<tr>
<td>defaultroot</td><td>localhost</td><td>Default-Wert für
das Root-Objekt. Details finden Sie in der <a
href=./automap.html>Automap-Dokumentation</a></td>
diff --git a/docs/en_US/automap.html b/docs/en_US/automap.html
index d24c314..b498434 100644
--- a/docs/en_US/automap.html
+++ b/docs/en_US/automap.html
@@ -47,9 +47,6 @@
<td>root</td><td> see <a href="#root/object/definition">root
object definition</a> </td><td> This is the name of the root object. It is not
essential to set the host here. There are some more ways to tell the root
object. For details see the <a href="#root/object/definition">root object
definition</a> chapter on this page. </td>
</tr>
<tr>
- <td>maxLayers</td><td>2</td><td>This option is deprecated. Use
childLayers instead (See below).</td>
- </tr>
- <tr>
<td>childLayers</td><td>2</td><td>Maximum layers of child hosts to
be displayed.</td>
</tr>
<tr>
diff --git a/docs/en_US/nagvis_config_format_description.html
b/docs/en_US/nagvis_config_format_description.html
index 214e0eb..0ea8397 100644
--- a/docs/en_US/nagvis_config_format_description.html
+++ b/docs/en_US/nagvis_config_format_description.html
@@ -383,7 +383,7 @@
<th width="200"> Value </th><th width="150"> Default </th><th>
Description </th>
</tr>
<tr>
- <td> defaultparams </td><td> &maxLayers=2 </td><td> These are
the parameters for the automap views and links in the lists (map index page,
dropdown menus in header) </td>
+ <td> defaultparams </td><td> &childLayers=2 </td><td> These
are the parameters for the automap views and links in the lists (map index
page, dropdown menus in header) </td>
</tr>
<tr>
<td> defaultroot </td><td> localhost </td><td> Default value for
the root object. For details see <a href="automap.html">Automap
documentation</a> </td>
diff --git a/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
b/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
index d9f1322..fd2b9d5 100644
--- a/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
+++ b/share/frontend/nagvis-js/classes/FrontendModAutoMap.php
@@ -42,7 +42,6 @@ class FrontendModAutoMap extends FrontendModule {
'search' => MATCH_STRING_NO_SPACE_EMPTY,
'backend' => MATCH_STRING_NO_SPACE_EMPTY,
'root' => MATCH_STRING_NO_SPACE_EMPTY,
- 'maxLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
'childLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
'parentLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
'renderMode' => MATCH_AUTOMAP_RENDER_MODE,
diff --git a/share/server/core/classes/CoreModAutoMap.php
b/share/server/core/classes/CoreModAutoMap.php
index f04fb37..9e38819 100644
--- a/share/server/core/classes/CoreModAutoMap.php
+++ b/share/server/core/classes/CoreModAutoMap.php
@@ -37,7 +37,6 @@ class CoreModAutoMap extends CoreModule {
$this->aOpts = Array('show' => MATCH_MAP_NAME,
'backend' => MATCH_STRING_NO_SPACE_EMPTY,
'root' => MATCH_STRING_NO_SPACE_EMPTY,
- 'maxLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
'childLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
'parentLayers' => MATCH_INTEGER_PRESIGN_EMPTY,
'renderMode' => MATCH_AUTOMAP_RENDER_MODE,
diff --git a/share/server/core/classes/NagVisAutoMap.php
b/share/server/core/classes/NagVisAutoMap.php
index 399472c..0411edb 100644
--- a/share/server/core/classes/NagVisAutoMap.php
+++ b/share/server/core/classes/NagVisAutoMap.php
@@ -114,13 +114,6 @@ class NagVisAutoMap extends GlobalMap {
$prop['root'] = $this->getRootHostName();
/**
- * This is for compatibility to old the old parent layer limitation
- * FIXME: May be removed in 1.6
- */
- if(isset($prop['maxLayers']) && $prop['maxLayers'] != '')
- $prop['childLayers'] = $prop['maxLayers'];
-
- /**
* This sets how many child layers should be displayed. Default value
is -1,
* this means no limitation.
*/
diff --git a/share/server/core/classes/NagVisViewAutomapModifyParams.php
b/share/server/core/classes/NagVisViewAutomapModifyParams.php
index 4ed270e..6e253e1 100644
--- a/share/server/core/classes/NagVisViewAutomapModifyParams.php
+++ b/share/server/core/classes/NagVisViewAutomapModifyParams.php
@@ -65,7 +65,6 @@ class NagVisViewAutomapModifyParams {
$this->aOpts = $MAP->getOptions();
// Skip unwanted params
- unset($this->aOpts['maxLayers']);
unset($this->aOpts['perm']);
}
}
------------------------------------------------------------------------------
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
