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

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-11-15 06:42:43 -0800 (Mon, 15 Nov 2010)
New Revision: 7126

Modified:
   trunk/mapbender/http/plugins/mb_sessionWmc.js
Log:
open dialog if constraints need to be displayed

Modified: trunk/mapbender/http/plugins/mb_sessionWmc.js
===================================================================
--- trunk/mapbender/http/plugins/mb_sessionWmc.js	2010-11-15 14:23:31 UTC (rev 7125)
+++ trunk/mapbender/http/plugins/mb_sessionWmc.js	2010-11-15 14:42:43 UTC (rev 7126)
@@ -85,6 +85,7 @@
 	var displayConstraints = function (obj) {
 		var html = "";
 		var constraintTypeArray = [];
+		var dialogHasContent = false;
 		var wmsCount = 0;
 
 		for (var constraintType in obj) {
@@ -92,28 +93,34 @@
 			//check if terms of use has been set - then there are tou given in the message!
 			if (constraintType === "wmcTou" && caseObj.message != "") {
 				html += "<fieldset>"+caseObj.message+"</fieldset>";
+				dialogHasContent = true;
 				continue;
 			}
 			if (caseObj.wms && caseObj.wms.length === 0) {
 				continue;
 			}
 
-			html += "<fieldset>" + caseObj.message + 
-				(constraintType === "noPermission" ? "<br><ul>" : " Sollen diese Dienste trotzdem hinzugeladen werden?<br><br>");
-
+			var permissionHtml = "";
 			for (var index in caseObj.wms) {
 				var wms = caseObj.wms[index];
-				html += "<label for='" + constraintType + "_" + wms.index + "'>" +
+				permissionHtml += "<label for='" + constraintType + "_" + wms.index + "'>" +
 				(constraintType === "noPermission" ? "<li>" : "<input id='" + options.id + "_" + constraintType + "_" + wms.index + "' " + "type='checkbox' />") +
 				wms.title  + "</label><br>";
 				wmsCount++;
 			}
-			html += (constraintType === "noPermission" ? "</ul>" : "");
-			html += "</fieldset><br>";
+			if (wmsCount > 0) {
+				html += "<fieldset>" + caseObj.message +
+					(constraintType === "noPermission" ?
+						"<br><ul>" + permissionHtml + "</ul>" :
+						" Sollen diese Dienste trotzdem hinzugeladen werden?<br><br>" +
+						permissionHtml
+					) + "</fieldset><br>";
+				dialogHasContent = true;
+			}
 			constraintTypeArray.push(constraintType);
 		}
 		
-		if (wmsCount === 0) {
+		if (!dialogHasContent) {
 			return;
 		}
 
@@ -135,7 +142,7 @@
 			}
 		);
 
-		$("#" + options.id + "_constraint_form").dialog('open');
+		$dialog.dialog('open');
 	};