r4544 - trunk/lib/admin

[daigle at ecoinformatics.org]

Author: daigle
Date: 2008-11-10 15:14:37 -0800 (Mon, 10 Nov 2008)
New Revision: 4544

Modified:
   trunk/lib/admin/admin.js
   trunk/lib/admin/ldap-configuration.jsp
Log:
Use validation for form submiTtal.  This validates that all fields are populated.

Modified: trunk/lib/admin/admin.js
===================================================================
--- trunk/lib/admin/admin.js	2008-11-10 23:13:28 UTC (rev 4543)
+++ trunk/lib/admin/admin.js	2008-11-10 23:14:37 UTC (rev 4544)
@@ -35,17 +35,20 @@
     return true;
 }
 
-function submitForm(action,form_ref) {
-	form_ref.action.value=action;
-	form_ref.sessionId.value=<xsl:value-of select="$sessid" />;
+function submitForm(form_ref) {
+//	form_ref.action.value=action;
+//	form_ref.sessionId.value=<xsl:value-of select="$sessid" />;
 	form_ref.submit();
 }
 
-function validataAndSubmitForm(action,form_ref) {
-	form_ref.action.value=action;
-	form_ref.sessionId.value=<xsl:value-of select="$sessid" />;
-	validateForm(form_ref)
+function validateAndSubmitForm(form_ref) {
+//	form_ref.action.value=action;
+//	form_ref.sessionId.value=<xsl:value-of select="$sessid" />;
+	if (!validateForm(form_ref)) {
+		return false;
+	}
 	form_ref.submit();
+
 }
 
 function forward(location) {

Modified: trunk/lib/admin/ldap-configuration.jsp
===================================================================
--- trunk/lib/admin/ldap-configuration.jsp	2008-11-10 23:13:28 UTC (rev 4543)
+++ trunk/lib/admin/ldap-configuration.jsp	2008-11-10 23:14:37 UTC (rev 4544)
@@ -46,7 +46,7 @@
 
 
 <form method="POST" name="configuration_form" action="<%= request.getContextPath() %>/admin" 
-                                        onsubmit="return submitForm(this);">
+                                        onsubmit="return validateAndSubmitForm(this);">
 <% 
 	// metadata holds all group and properties metadata
     PropertiesMetaData metadata = (PropertiesMetaData)request.getAttribute("metadata");