Author: Lars Michelsen <[email protected]>
Date: Tue Oct 23 10:46:11 2012 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Oct 23 10:46:11 2012 +0200
Bugfix: Fixed problem in geomap exception handling
---
ChangeLog | 3 +++
share/frontend/nagvis-js/js/frontend.js | 4 +++-
share/server/core/sources/geomap.php | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9a5735d..69a7fa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
1.7.3
+Core:
+ * Bugfix: Fixed problem in geomap exception handling
+
Frontend:
* Bugfix: Re-added "loading..." message on page redering
diff --git a/share/frontend/nagvis-js/js/frontend.js
b/share/frontend/nagvis-js/js/frontend.js
index d96fe49..f51cc90 100644
--- a/share/frontend/nagvis-js/js/frontend.js
+++ b/share/frontend/nagvis-js/js/frontend.js
@@ -1474,12 +1474,14 @@ function parseOverviewRotations(aRotationsConf) {
if(oObj !== null) {
// Save object to map objects array
- aRotations.push(oObj);
+ //aRotations.push(oObj);
// Parse object to overview
oObj.parseOverview();
}
}
+ } else {
+ // Hide the rotations container
}
eventlog("worker", "debug", "setOverviewObjects: End setting rotations");
diff --git a/share/server/core/sources/geomap.php
b/share/server/core/sources/geomap.php
index 500d2ea..c7c684f 100644
--- a/share/server/core/sources/geomap.php
+++ b/share/server/core/sources/geomap.php
@@ -51,7 +51,7 @@ function geomap_get_contents($url) {
throw new GeomapError(l('Unable to fetch URL "[U]".<br/><br />The
geomap needs to be able to fetch '
.'some data from the internet via
webservice API. Please take a look '
.'at the docs for more details.<br /><br
/><small>[E]</small>',
- Array('U' => $url, 'E' => $e)));
+ Array('U' => $url, 'E' =>
$e->getMessage())));
}
}
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
