[Mapbender-commits] r1246 - trunk/mapbender/http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2007-03-28 04:49:09 -0400 (Wed, 28 Mar 2007)
New Revision: 1246

Modified:
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
Log:
buttons in wfs window are disabled to avoid multiple ajax requests

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2007-03-28 08:47:01 UTC (rev 1245)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2007-03-28 08:49:09 UTC (rev 1246)
@@ -1067,12 +1067,12 @@
 
 			var options = ["save", "update", "delete", "abort"];
 			for (var i = 0 ; i < options.length ; i++) {
-				var onClickText = "var result = window.opener.formCorrect(document, '"+featureTypeElementFormId+"');";
+				var onClickText = "this.disabled=true;var result = window.opener.formCorrect(document, '"+featureTypeElementFormId+"');";
 				onClickText += 	"if (result.isCorrect) {";
-				onClickText += 		"window.opener.dbGeom('"+options[i]+"', "+memberIndex+")";
+				onClickText += 		"window.opener.dbGeom('"+options[i]+"', "+memberIndex+"); ";
 				onClickText += 	"}";
 				onClickText += 	"else {";
-				onClickText += 		"alert(result.errorMessage);"
+				onClickText += 		"alert(result.errorMessage);this.disabled=false;"
 				onClickText += 	"}";
 				
 				if (options[i] == "save" && hasGeometryColumn && (!fid || showSaveButtonForExistingGeometries)) {
@@ -1123,7 +1123,7 @@
 		var fid = false;
 		var errorMessage = "";
 		if (typeof(wfsWindow) != 'undefined' && !wfsWindow.closed) {
-			var myform = wfsWindow.document.getElementById(featureTypeElementFormId);
+			myform = wfsWindow.document.getElementById(featureTypeElementFormId);
 		
 			for (var i=0; i<myform.length; i++){
 				if (myform.elements[i].id == "fid") {
@@ -1153,6 +1153,8 @@
 			fid = d.get(m).e.getElementValueByName('fid');
 		}
 		str = parent.get_wfs_str(myconf, d, m, type, fid);
+		
+		
 		parent.mb_ajax_post("../extensions/geom2wfst.php", {'filter':str,'url':myconf['wfs_transaction']}, function(json,status){
 			var result = eval('('+json+')');
 			var response = result.response;
@@ -1180,12 +1182,11 @@
 		var wfsWriteMessage = messageErrorWfsWrite[selectedLanguage];
 	} 
 	if (typeof(wfsWindow) != 'undefined' && !wfsWindow.closed) {
-		wfsWindow.alert(wfsWriteMessage);
+//		wfsWindow.opener.focus();
+		wfsWindow.document.close();
 		wfsWindow.close();
 	}
-	else {
-		alert(wfsWriteMessage);
-	}
+	alert(wfsWriteMessage);
 }
 // --- wfs window (begin) -----------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------