You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/15 13:01:07 UTC
svn commit: r1300944 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/main.js redback/register.js redback/user.js
Author: olamy
Date: Thu Mar 15 12:01:07 2012
New Revision: 1300944
URL: http://svn.apache.org/viewvc?rev=1300944&view=rev
Log:
[MRM-1617] reset password link
display change password box after key validation.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1300944&r1=1300943&r2=1300944&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Thu Mar 15 12:01:07 2012
@@ -70,6 +70,11 @@ $(function() {
validateKey(validateMeId);
return;
}
+ var resetPassword= $.urlParam('resetPassword');
+ if (resetPassword){
+ resetPasswordForm(resetPassword);
+ return;
+ }
var browse = $.urlParam('browse');
if (browse){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js?rev=1300944&r1=1300943&r2=1300944&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.js Thu Mar 15 12:01:07 2012
@@ -96,7 +96,7 @@ $(function() {
* validate a registration key and go to change password key
* @param key
*/
- validateKey=function(key) {
+ validateKey=function(key,registration) {
// FIXME spinner display
$.ajax({
url: 'restServices/redbackServices/userService/validateKey/'+key,
@@ -104,7 +104,7 @@ $(function() {
success: function(result){
window.redbackModel.key=key;
$.log("validateKey#sucess");
- changePasswordBox(false,true,null);
+ changePasswordBox(false,registration?registration:true,null);
},
complete: function(){
// hide spinner
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1300944&r1=1300943&r2=1300944&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js Thu Mar 15 12:01:07 2012
@@ -410,6 +410,13 @@ $(function() {
$("#small-spinner").remove();
}
+ resetPasswordForm=function(key){
+ $.log("resetPasswordForm:"+key);
+ validateKey(key,false);
+ $.log("resetPasswordForm#validateKey ok");
+ displaySearch();
+ }
+
passwordReset=function(){
var username = $("#user-login-form-username" ).val();
if(username.trim().length<1){
@@ -426,16 +433,17 @@ $(function() {
}
$("#user-messages" ).html(mediumSpinnerImg());
$.ajax("restServices/redbackServices/userService/resetPassword/"+encodeURIComponent(username), {
- type: "GET",
- success: function(result) {
- clearUserMessages();
- displaySuccessMessage( $.i18n.prop("password.reset.success"));
- },
- error: function(result) {
- var obj = jQuery.parseJSON(result.responseText);
- displayRedbackError(obj);
- }
- });
+ type: "GET",
+ success: function(result) {
+ clearUserMessages();
+ displayInfoMessage($.i18n.prop("password.reset.success"));
+ },
+ error: function(result) {
+ clearUserMessages();
+ var obj = jQuery.parseJSON(result.responseText);
+ displayRedbackError(obj);
+ }
+ });
}
/**