dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3010
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-03-11 15:49:21 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm	2011-03-11 13:35:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/updateUserAccountForm.vm	2011-03-11 14:49:21 +0000
@@ -1,5 +1,6 @@
 <script>
 	jQuery(document).ready(	function() {
+		/* validation */
 		var rules = {
 			oldPassword: {required: true},
 			rawPassword: {required:false, password:true, rangelength: [8, 35], notequalto:'#username'},
@@ -20,6 +21,33 @@
 		jQuery("#firstName").attr("maxlength", "140");
 		jQuery("#email").attr("maxlength", "160");
 		jQuery("#phoneNumber").attr("maxlength", "80");
+		/* end validation */
+
+		var oldPassword = byId( 'oldPassword' );
+		oldPassword.select();
+		oldPassword.focus();
+		
+		function updateUser()
+		{
+			var request = new Request();
+			request.setResponseTypeXML( 'xmlObject' );
+			request.setCallbackSuccess(updateUserReceived);
+	
+			var params = "id=" + byId('id').value;
+				params += "&oldPassword=" + byId('oldPassword').value;
+				params += "&rawPassword=" + byId('rawPassword').value;
+				params += "&retypePassword=" + byId('retypePassword').value;
+				params += "&surname=" + byId('surname').value;
+				params += "&firstName=" + byId('firstName').value;
+				params += "&email=" + byId('email').value;
+				params += "&phoneNumber=" + byId('phoneNumber').value;
+			request.sendAsPost( params );
+			request.send( 'updateUserAccount.action');
+		}
+		
+		function updateUserReceived(xmlObject){
+				setMessage(xmlObject.firstChild.nodeValue);
+		}
 	});
 </script>
 
@@ -77,32 +105,3 @@
 </form>
 
 <span id="message"></span>
-
-<script type="text/javascript">
-	var oldPassword = byId( 'oldPassword' );
-	oldPassword.select();
-	oldPassword.focus();
-	
-	function updateUser()
-	{
-		var request = new Request();
-		request.setResponseTypeXML( 'xmlObject' );
-		request.setCallbackSuccess(updateUserReceived);
-
-		var params = "id=" + byId('id').value;
-			params += "&oldPassword=" + byId('oldPassword').value;
-			params += "&rawPassword=" + byId('rawPassword').value;
-			params += "&retypePassword=" + byId('retypePassword').value;
-			params += "&surname=" + byId('surname').value;
-			params += "&firstName=" + byId('firstName').value;
-			params += "&email=" + byId('email').value;
-			params += "&phoneNumber=" + byId('phoneNumber').value;
-		request.sendAsPost( params );
-		request.send( 'updateUserAccount.action');
-	}
-	
-	function updateUserReceived(xmlObject){
-			setMessage(xmlObject.firstChild.nodeValue);
-	}
-	
-</script>