From: Olivier Lamy <olamy@apache.org>
Date: Fri, 16 Mar 2012 16:08:26 +0000 (+0000)
Subject: use the selected repository to browse content
X-Git-Tag: archiva-1.4-M3~1016
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0f37a939f8c5d028213c3ad1b769f8cf4898d4aa;p=archiva.git

use the selected repository to browse content

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1301614 13f79535-47bb-0310-9956-ffa450edef68
---

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 e399ee20a..fb31c2bb2 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
@@ -91,7 +91,17 @@ $(function() {
           browseResult.html(mediumSpinnerImg());
           browseBreadCrumb.html(smallSpinnerImg());
           mainContent.find("#main_browse_result_content" ).show();
-          var url = restUrl ? restUrl : "restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId);
+          var url = "";
+          if (!restUrl) {
+            url="restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId);
+            var selectedRepo=getSelectedBrowsingRepository();
+            if (selectedRepo){
+              url+="?repositoryId="+selectedRepo;
+            }
+          }else {
+            url=restUrl;
+          }
+
           $.ajax(url, {
             type: "GET",
             dataType: 'json',
@@ -218,6 +228,10 @@ $(function() {
     if (groupId){
       url="restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(groupId);
     }
+    var selectedRepo=getSelectedBrowsingRepository();
+    if (selectedRepo){
+      url+="?repositoryId="+selectedRepo;
+    }
     $( "#main-content #browse-autocomplete" ).autocomplete({
       minLength: 2,
 			source: function(request, response){
@@ -261,7 +275,12 @@ $(function() {
           } else {
             query=groupId?groupId:request.term;
           }
-        $.get("restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(query),
+        var browseUrl="restServices/archivaServices/browseService/browseGroupId/"+encodeURIComponent(query);
+        var selectedRepo=getSelectedBrowsingRepository();
+        if (selectedRepo){
+          browseUrl+="?repositoryId="+selectedRepo;
+        }
+        $.get(browseUrl,
            function(data) {
              var browseResultEntries = mapbrowseResultEntries(data);
              if (dotEnd){