From ca9aa5edf27a19301221fbb6815c42d1dd55d728 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 5 Mar 2012 08:44:37 +0000 Subject: [PATCH] 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 --- .../archiva-webapp-js/src/main/webapp/js/archiva/main.js | 4 ++++ .../archiva-webapp-js/src/main/webapp/js/archiva/search.js | 1 + 2 files changed, 5 insertions(+) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js index f3cc20496..6dbf05346 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js @@ -75,6 +75,8 @@ $(function() { if (browse){ displayBrowseGroupId(browse); return; + }else{ + $.log("no browse"); } var screen = $.urlParam('screen'); @@ -93,6 +95,7 @@ $(function() { decorateMenuWithKarma=function(user) { var username = user.username; + $.log("decorateMenuWithKarma"); // we can receive an observable user so take if it's a function or not if ($.isFunction(username)){ username = user.username(); @@ -154,6 +157,7 @@ $(function() { $("#login-link").show(); $("#register-link").show(); $("#change-password-link").hide(); + checkUrlParams(); } else { $("#change-password-link").show(); $("#logout-link").show(); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js index bb78f2931..130b05ffb 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js @@ -283,6 +283,7 @@ $(function() { */ displayBrowseGroupId=function(groupId){ clearUserMessages(); + $.log("displayBrowseGroupId:"+groupId); var mainContent = $("#main-content"); mainContent.html($("#browse-tmpl" ).tmpl()); mainContent.find("#browse_result").html(mediumSpinnerImg());