Author: Lars Michelsen <[email protected]>
Date: Tue Jan 14 10:41:18 2014 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Jan 14 10:41:18 2014 +0100
FIX: Fixed broken NagVis Multisite sidebar dashlet
---
ChangeLog | 2 ++
share/server/core/classes/objects/NagVisMapObj.php | 10 +++++++++-
share/server/core/classes/objects/NagVisObject.php | 5 +++++
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5e44373..e0ebe50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
1.8b3
+Frontend:
+ * FIX: Fixed broken NagVis Multisite sidebar dashlet
1.8b2
Frontend:
diff --git a/share/server/core/classes/objects/NagVisMapObj.php
b/share/server/core/classes/objects/NagVisMapObj.php
index e2e0f65..e5b3b67 100644
--- a/share/server/core/classes/objects/NagVisMapObj.php
+++ b/share/server/core/classes/objects/NagVisMapObj.php
@@ -40,7 +40,6 @@ class NagVisMapObj extends NagVisStatefulObject {
protected $linkedMaps;
protected $map_name;
- protected $alias;
// When this map object summarizes the state of a map this is true
// Prevents loops
@@ -73,6 +72,15 @@ class NagVisMapObj extends NagVisStatefulObject {
}
/**
+ * Special handling for maps, because the alias has been set before
+ */
+ public function setState($arr) {
+ $alias = $this->state[ALIAS];
+ $this->state = $arr;
+ $this->state[ALIAS] = $alias;
+ }
+
+ /**
* Clears the map
*/
public function clearMembers() {
diff --git a/share/server/core/classes/objects/NagVisObject.php
b/share/server/core/classes/objects/NagVisObject.php
index c61fade..d860419 100644
--- a/share/server/core/classes/objects/NagVisObject.php
+++ b/share/server/core/classes/objects/NagVisObject.php
@@ -328,6 +328,11 @@ class NagVisObject {
else
$arr[$attr] = '';
}
+ } elseif ($this->type == 'map') {
+ if (isset($this->state[ALIAS]))
+ $arr['alias'] = $this->state[ALIAS];
+ else
+ $arr['alias'] = '';
}
// Add the custom htmlcgi path for the object
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
