=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/recovery.js 2012-10-30 07:18:35 +0000
@@ -0,0 +1,26 @@
+
+function recoverAccount()
+{
+ var username = $.trim( $( "#username" ).val() );
+
+ if ( username.length == 0 )
+ {
+ return false;
+ }
+
+ $.ajax( {
+ url: "../../api/account/recovery",
+ data: {
+ username: username
+ },
+ type: "post",
+ success: function( data ) {
+ $( "#recoveryForm" ).hide();
+ $( "#recoverySuccessMessage" ).fadeIn();
+ },
+ error: function( data ) {
+ $( "#recoveryForm" ).hide();
+ $( "#recoveryErrorMessage" ).fadeIn();
+ }
+ } );
+}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/restore.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/restore.js 2012-10-30 06:50:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/useraccount/restore.js 2012-10-30 07:18:35 +0000
@@ -1,26 +1,51 @@
-
-function recoverAccount()
+var validationRules = {
+ rules: {
+ code: {
+ required: true
+ },
+ password: {
+ required: true,
+ rangelength: [ 8, 80 ],
+ password: true
+ },
+ retypePassword: {
+ required: true,
+ equalTo: "#password",
+ }
+ }
+};
+
+$( document ).ready( function() {
+
+ $( "#restoreForm" ).validate( {
+ rules: validationRules.rules,
+ submitHandler: restoreSubmitHandler,
+ errorPlacement: function( error, element ) {
+ element.parent( "td" ).append( "
" ).append( error );
+ }
+ } );
+} );
+
+function restoreSubmitHandler()
{
- var username = $.trim( $( "#username" ).val() );
-
- if ( username.length == 0 )
- {
- return false;
- }
-
+ $( "#submitButton" ).attr( "disabled", "disabled" );
+
$.ajax( {
- url: "../../api/account/recovery",
+ url: "../../api/account/restore",
data: {
- username: username
+ username: $( "#username" ).val(),
+ token: $( "#token" ).val(),
+ code: $( "#code" ).val(),
+ password: $( "#password" ).val()
},
type: "post",
success: function( data ) {
- $( "#recoveryForm" ).hide();
- $( "#recoverySuccessMessage" ).fadeIn();
+ $( "#restoreForm" ).hide();
+ $( "#restoreSuccessMessage" ).fadeIn();
},
- error: function( data ) {
- $( "#recoveryForm" ).hide();
- $( "#recoveryErrorMessage" ).fadeIn();
+ error: function( jqXHR, textStatus, errorThrown ) {
+ $( "#submitButton" ).removeAttr( "disabled" );
+ $( "#restoreErrorMessage" ).fadeIn();
}
- } );
-}
+ } );
+}
\ No newline at end of file
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm 2012-10-30 06:50:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/useraccount/recovery.vm 2012-10-30 07:18:35 +0000
@@ -3,7 +3,7 @@