Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MRM-1789] Register link appears after logging in and back out even "Disable registration Link" is checked 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1551850 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2013-12-18 05:27:48 +00:00
parent 5aa767e4cb
commit 72f6efc5a4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/main.js
View File

@ -95,9 +95,6 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
url: 'restServices/redbackServices/loginService/logout' url: 'restServices/redbackServices/loginService/logout'
} ).always( } ).always(
function(){ function(){
// go to welcome on logout
//window.sammyArchivaApplication.setLocation("#welcome");
//$.log("displayWelcome");
window.sammyArchivaApplication.setLocation("#welcome"); window.sammyArchivaApplication.setLocation("#welcome");
displayWelcome(); displayWelcome();
} }
@ -772,9 +769,9 @@ function(jquery,ui,sammy,tmpl,i18n,jqueryCookie,bootstrap,archivaSearch,jqueryVa
displayWelcome=function(){ displayWelcome=function(){
checkCreateAdminLink(function(){ checkCreateAdminLink(function(){
//window.sammyArchivaApplication.setLocation("#search")
$("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: window.archivaRuntimeInfo})); $("#main-content" ).html($("#welcome" ).tmpl({runtimeInfo: window.archivaRuntimeInfo}));
drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome"); drawQuickSearchAutocomplete("#quick-search-autocomplete-welcome");
updateAppearanceToolBar();
}); });
}; };