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/11/14 21:03:54 UTC
svn commit: r1409346 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/archiva.js redback/user.js
Author: olamy
Date: Wed Nov 14 20:03:53 2012
New Revision: 1409346
URL: http://svn.apache.org/viewvc?rev=1409346&view=rev
Log:
after reset password remove resetPassword from url
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.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/archiva.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js?rev=1409346&r1=1409345&r2=1409346&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/archiva.js Wed Nov 14 20:03:53 2012
@@ -77,6 +77,7 @@ $.ajax({
"jquery.fileupload.ip":"jquery.fileupload-ip-1.0.6",
"jquery.fileupload.ui":"jquery.fileupload-ui-6.6.3",
"tmpl": "tmpl.min",
+ "purl": "purl-2.2.1",
"prettify": "prettify",
"sammy": "sammy.0.7.1",
"jqueryFileTree": "jqueryFileTree-1.0.1",
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=1409346&r1=1409345&r2=1409346&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 Wed Nov 14 20:03:53 2012
@@ -16,8 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid"],
-function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid) {
+define("redback.user",["jquery","utils","i18n","jquery.validate","knockout","knockout.simpleGrid","purl"],
+function(jquery,utils,i18n,jqueryValidate,ko,koSimpleGrid,purl) {
/**
* object model for user with some function to create/update/delete users
@@ -482,6 +482,19 @@ function(jquery,utils,i18n,jqueryValidat
displayErrorMessage("issue appended");
}
window.modalChangePasswordBox.modal('hide');
+ var curHash = getUrlHash();
+ var url = $.url(window.location);
+ var newLocation=url.attr("path");
+ var requestLang=url.param("request_lang");
+ if(requestLang){
+ newLocation+="?request_lang="+requestLang;
+ }
+ if(curHash){
+ newLocation+="#"+curHash;
+ }else{
+ newLocation+="#search";
+ }
+ window.location=newLocation;
}
});