Author: olamy
Date: Fri Dec 9 14:50:43 2011
New Revision: 1212455
URL: http://svn.apache.org/viewvc?rev=1212455&view=rev
Log:
fix handling of registration link
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/redback.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/register.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=1212455&r1=1212454&r2=1212455&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
Fri Dec 9 14:50:43 2011
@@ -36,27 +36,6 @@ $(function() {
}
/**
- * return a user see user.js if user logged otherwise null
- */
- userLogged=function() {
- // call restServices/redbackServices/loginService/isLogged to know
- // if a session exists and check the cookie
- var userLogged = true;
- $.ajax("restServices/redbackServices/loginService/isLogged", {
- type: "GET",
- async: false,
- success: function(data) {
- userLogged = JSON.parse(data);
- }
- });
- if (userLogged == false)
- {
- return null;
- }
- return jQuery.parseJSON($.cookie('redback_login'));
- }
-
- /**
* reccord a cookie for session with the logged user
* @param user see user.js
*/
@@ -167,13 +146,20 @@ $(function() {
+ // handle url with registration link
+ $(document).ready(function() {
+ var validateMeId = $.urlParam('validateMe');
+ if (validateMeId) {
+ validateKey(validateMeId);
+ }
+ });
- $.log("main.js dom ready");
- $('#topbar-menu-container').html($("#topbar-menu"));
- $('#sidebar-content').html($("#main-menu"));
- checkCreateAdminLink();
- hideElementWithKarma();
- checkSecurityLinks();
+ $.log("main.js dom ready");
+ $('#topbar-menu-container').html($("#topbar-menu"));
+ $('#sidebar-content').html($("#main-menu"));
+ checkCreateAdminLink();
+ hideElementWithKarma();
+ checkSecurityLinks();
})
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1212455&r1=1212454&r2=1212455&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
Fri Dec 9 14:50:43 2011
@@ -74,4 +74,25 @@ $(function() {
$("#dialog-confirm" ).dialog("close");
}
+ /**
+ * return a user see user.js if user logged otherwise null
+ */
+ userLogged=function() {
+ // call restServices/redbackServices/loginService/isLogged to know
+ // if a session exists and check the cookie
+ var userLogged = true;
+ $.ajax("restServices/redbackServices/loginService/isLogged", {
+ type: "GET",
+ async: false,
+ success: function(data) {
+ userLogged = JSON.parse(data);
+ }
+ });
+ if (userLogged == false)
+ {
+ return null;
+ }
+ return jQuery.parseJSON($.cookie('redback_login'));
+ }
+
});
\ No newline at end of file
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=1212455&r1=1212454&r2=1212455&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
Fri Dec 9 14:50:43 2011
@@ -97,7 +97,7 @@ $(function() {
success: function(result){
window.redbackModel.key=key;
$.log("validateKey#sucess");
- changePasswordBox(false,true);
+ changePasswordBox(false,true,null);
},
complete: function(){
// hide spinner
@@ -111,13 +111,4 @@ $(function() {
})
}
-
- // handle url with registration link
- $(document).ready(function() {
- var validateMeId = $.urlParam('validateMe');
- if (validateMeId) {
- validateKey(validateMeId);
- }
- });
-
});
\ No newline at end of file
