[Mapbender-commits] r7779 - trunk/mapbender/http/plugins

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2011-04-18 09:00:33 -0700 (Mon, 18 Apr 2011)
New Revision: 7779

Modified:
   trunk/mapbender/http/plugins/mb_print.php
Log:
bugfix for reading legend_urls for new print module - some fix is needed on serverside too!

Modified: trunk/mapbender/http/plugins/mb_print.php
===================================================================
--- trunk/mapbender/http/plugins/mb_print.php	2011-04-18 13:07:23 UTC (rev 7778)
+++ trunk/mapbender/http/plugins/mb_print.php	2011-04-18 16:00:33 UTC (rev 7779)
@@ -384,7 +384,7 @@
 							layerLegendObj.name = currentLayer.layer_name;
 							layerLegendObj.title = currentWms.getTitleByLayerName(currentLayer.layer_name);
 							var layerStyle = currentWms.getCurrentStyleByLayerName(currentLayer.layer_name);
-							if (layerStyle === false) {
+							if (layerStyle === false || layerStyle === "") {
 								layerStyle = "default";
 							}
 							layerLegendObj.legendUrl = currentWms.getLegendUrlByGuiLayerStyle(currentLayer.layer_name, layerStyle);
@@ -397,11 +397,13 @@
 						var tmpObj = {};
 						tmpObj[currentWms.wms_currentTitle] = wmsLegendObj;
 						legendUrlArray.push(tmpObj);
+					
 					}
 				}
 			}
 		}
-		updateFormField(formData, "legend_url", $.toJSON(legendUrlArray));
+		var legendUrlArrayJson =  $.toJSON(legendUrlArray);
+		updateFormField(formData, "legend_url", legendUrlArrayJson);
 		updateFormField(formData, "map_url", f.map_url.value);
 		updateFormField(formData, "scale", scale);