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

display search or checkUrl param even if user not logged in 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1296963 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-03-05 08:44:37 +00:00
parent ea1d50853f
commit ca9aa5edf2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,8 @@ $(function() {
if (browse){ if (browse){
displayBrowseGroupId(browse); displayBrowseGroupId(browse);
return; return;
}else{
$.log("no browse");
} }
var screen = $.urlParam('screen'); var screen = $.urlParam('screen');
@ -93,6 +95,7 @@ $(function() {
decorateMenuWithKarma=function(user) { decorateMenuWithKarma=function(user) {
var username = user.username; var username = user.username;
$.log("decorateMenuWithKarma");
// we can receive an observable user so take if it's a function or not // we can receive an observable user so take if it's a function or not
if ($.isFunction(username)){ if ($.isFunction(username)){
username = user.username(); username = user.username();
@ -154,6 +157,7 @@ $(function() {
$("#login-link").show(); $("#login-link").show();
$("#register-link").show(); $("#register-link").show();
$("#change-password-link").hide(); $("#change-password-link").hide();
checkUrlParams();
} else { } else {
$("#change-password-link").show(); $("#change-password-link").show();
$("#logout-link").show(); $("#logout-link").show();

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

@ -283,6 +283,7 @@ $(function() {
*/ */
displayBrowseGroupId=function(groupId){ displayBrowseGroupId=function(groupId){
clearUserMessages(); clearUserMessages();
$.log("displayBrowseGroupId:"+groupId);
var mainContent = $("#main-content"); var mainContent = $("#main-content");
mainContent.html($("#browse-tmpl" ).tmpl()); mainContent.html($("#browse-tmpl" ).tmpl());
mainContent.find("#browse_result").html(mediumSpinnerImg()); mainContent.find("#browse_result").html(mediumSpinnerImg());