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

[svn_mapbender at osgeo.org]

Author: verenadiewald
Date: 2009-05-04 09:25:31 -0400 (Mon, 04 May 2009)
New Revision: 3922

Modified:
   trunk/mapbender/http/javascripts/mod_digitize_tab.php
Log:
http://trac.osgeo.org/mapbender/ticket/462

Modified: trunk/mapbender/http/javascripts/mod_digitize_tab.php
===================================================================
--- trunk/mapbender/http/javascripts/mod_digitize_tab.php	2009-05-03 19:42:18 UTC (rev 3921)
+++ trunk/mapbender/http/javascripts/mod_digitize_tab.php	2009-05-04 13:25:31 UTC (rev 3922)
@@ -1306,9 +1306,10 @@
 	isCorrect = isCorrect && result.isCorrect;
 	errorMessage += result.errorMessage;
 
-	result = validBoxEntrySelected(form);
-	isCorrect = isCorrect && result.isCorrect;
-	errorMessage += result.errorMessage;
+	//select box is now checked within function mandatoryFieldsNotEmpty
+	//result = validBoxEntrySelected(form);
+	//isCorrect = isCorrect && result.isCorrect;
+	//errorMessage += result.errorMessage;
 
 	result = dataTypeIsCorrect(doc, form);
 	isCorrect = isCorrect && result.isCorrect;
@@ -1351,6 +1352,15 @@
 				}
 			}
 		}
+		if (nodeArray[i].nodeName.toUpperCase() == "SELECT" && nodeArray[i].type == "hidden" && nodeArray[i].id.substr(0,10) == "mandatory_") {
+			var nodeId = nodeArray[i].id.substr(10);
+			if (nodeArray[i].value == "true") {
+				if (parseInt(form.childNodes[i].selectedIndex) == 0) {
+					isCorrect = false;
+					errorMessage += "'"+ doc.getElementById(nodeId).name +"': "+ msgObj.messageErrorFieldIsEmpty +"\n";
+				}
+			}
+		}
 	}
 	return {"isCorrect":isCorrect, "errorMessage":errorMessage};
 }
@@ -1650,6 +1660,8 @@
 							while (formElementHtml.match(/\\/)) {
 								formElementHtml = formElementHtml.replace(/\\/, "");
 							} 
+							str += "\t\t\t\t<input id = 'datatype_" + elementName + "' name='datatype' type='hidden' value = '" + elementType + "'>\n";
+							str += "\t\t\t\t<input id = 'mandatory_" + elementName + "' name='mandatory' type='hidden' value = '" + isMandatory + "'>\n";
 							// preselect the correct entry of the box
 							var patternString = "option value( )*=( )*'"+elementValue+"'";
 							var pattern = new RegExp(patternString);