Author: Lars Michelsen <[email protected]>
Date: Thu Nov 24 11:15:17 2011 +0100
Committer: Lars Michelsen <[email protected]>
Commit-Date: Thu Nov 24 11:15:17 2011 +0100
Bugfix: Don't enable map_image when not set when editing the global sections of
maps
---
ChangeLog | 2 ++
TODO | 2 +-
share/server/core/classes/CoreModMap.php | 2 +-
share/server/core/mapcfg/default.php | 17 +++++++++--------
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7513658..e4f4fd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ Frontend
* iconset option is now optional when creating maps using the GUI
* Reimplemented the "clone object" functionality in edit mode
* Only show the edit links in context menu when permitted to edit the map
+ * Bugfix: Don't enable map_image when not set when editing the global
+ sections of maps
1.6rc4
Core
diff --git a/TODO b/TODO
index f2ead93..e929be5 100644
--- a/TODO
+++ b/TODO
@@ -9,10 +9,10 @@ Relative Koordinaten:
- In WUI Fehler anzeigen
- Beim Config Parsen Fehlermeldung erzeugen
- Sidebar Folder auf/zu klappbar
-- Objekt klonen neu implementieren
- In Sidebar/Dropdown die aktuelle Map highlighten
- Abgebrochene Linie wieder aus Ansicht entfernen
- line_weather_color umbrechen wenn als Text dargestellt
+- line_label_y_offset wird noch nicht sauber berechnet
-------------------------------------------------------------------------------
diff --git a/share/server/core/classes/CoreModMap.php
b/share/server/core/classes/CoreModMap.php
index 10a123e..38ca823 100644
--- a/share/server/core/classes/CoreModMap.php
+++ b/share/server/core/classes/CoreModMap.php
@@ -837,7 +837,7 @@ class CoreModMap extends CoreModule {
if(!$MAPCFG->createMapConfig())
return false;
- $MAPCFG->addElement('global', $a, true);
+ $MAPCFG->addElement('global', $a, true, 0);
return true;
}
diff --git a/share/server/core/mapcfg/default.php
b/share/server/core/mapcfg/default.php
index f2f7fd6..bcdbbc9 100644
--- a/share/server/core/mapcfg/default.php
+++ b/share/server/core/mapcfg/default.php
@@ -146,27 +146,28 @@ function listBackendIds($CORE) {
$mapConfigVars = Array(
'type' => Array(
- 'must' => 0,
- 'match' => MATCH_OBJECTTYPE,
+ 'must' => 0,
+ 'match' => MATCH_OBJECTTYPE,
'field_type' => 'hidden',
),
'object_id' => Array(
- 'must' => 0,
- 'match' => MATCH_OBJECTID,
+ 'must' => 0,
+ 'match' => MATCH_OBJECTID,
'field_type' => 'hidden',
),
'allowed_for_config' => Array(
- 'must' => 0,
+ 'must' => 0,
'deprecated' => true,
- 'match' => MATCH_STRING,
+ 'match' => MATCH_STRING,
),
'allowed_user' => Array(
- 'must' => 0,
+ 'must' => 0,
'deprecated' => true,
- 'match' => MATCH_STRING,
+ 'match' => MATCH_STRING,
),
'map_image' => Array(
'must' => 0,
+ 'default' => '',
'match' => MATCH_PNG_GIF_JPG_FILE_OR_URL_NONE,
'field_type' => 'dropdown',
'list' => 'listMapImages',
------------------------------------------------------------------------------
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
