Author: Lars Michelsen <[email protected]>
Date: Sun May 13 11:27:45 2012 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Sun May 13 11:27:45 2012 +0200
FIX: Fixed js error during rendering problems; Fixed cycle geomap type
declaration
---
.../frontend/nagvis-js/js/NagVisStatefulObject.js | 5 +++--
share/server/core/sources/geomap.php | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/share/frontend/nagvis-js/js/NagVisStatefulObject.js
b/share/frontend/nagvis-js/js/NagVisStatefulObject.js
index 77803cf..46fbc0e 100644
--- a/share/frontend/nagvis-js/js/NagVisStatefulObject.js
+++ b/share/frontend/nagvis-js/js/NagVisStatefulObject.js
@@ -715,9 +715,10 @@ var NagVisStatefulObject = NagVisObject.extend({
var arr = this.id.split('-');
var objId = arr[0];
var obj = getMapObjByDomObjId(objId);
- if(!obj.bIsLocked)
+ if(obj && !obj.bIsLocked){
obj.redrawControls();
- obj = null;
+ obj = null;
+ }
objId = null;
arr = null;
};
diff --git a/share/server/core/sources/geomap.php
b/share/server/core/sources/geomap.php
index 433994f..80178ca 100644
--- a/share/server/core/sources/geomap.php
+++ b/share/server/core/sources/geomap.php
@@ -53,7 +53,7 @@ function list_geomap_types() {
return array(
'osmarender' => 'Osmarender',
'mapnik' => 'Mapnik',
- 'cycle ' => 'Cycle',
+ 'cycle' => 'Cycle',
);
}
@@ -204,7 +204,7 @@ function process_geomap($MAPCFG, $map_name, &$map_config) {
$data_url = $url . '&bboxReturnFormat=csv';
$contents = geomap_get_contents($data_url);
if(!preg_match('/^-?[0-9]+\.?[0-9]*,-?[0-9]+\.?[0-9]*,-?[0-9]+\.?[0-9]*,-?[0-9]+\.?[0-9]*$/i',
$contents))
- throw new NagVisException(l('Got invalid data from "[U]"',
array('U' => $data_url)));
+ throw new NagVisException(l('Got invalid data from "[U]": "[C]"',
array('U' => $data_url, 'C' => var_dump($contents))));
file_put_contents($data_path, $contents);
$parts = explode(',', $contents);
} else {
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
