more navigation history

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370965 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 2ef0f3e5313a41b420f727ac829753cced82f01f..7606ddb60d342c3fa409bbe03cdc4f67a7d9bd64 100644 (file)
--- 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
@@ -197,8 +197,16 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
     }
 
     displayParent=function(){
-      displayArtifactVersionDetailViewModel(self.projectVersionMetadata.mavenFacet.parent.groupId,self.projectVersionMetadata.mavenFacet.parent.artifactId,
-                                            self.projectVersionMetadata.mavenFacet.parent.version);
+      var selectedRepo=getSelectedBrowsingRepository();
+      var location ="#artifact";
+      if (selectedRepo){
+        location+="~"+selectedRepo;
+      }
+      location+="/"+self.projectVersionMetadata.mavenFacet.parent.groupId+"/"+self.projectVersionMetadata.mavenFacet.parent.artifactId;
+      location+="/"+self.projectVersionMetadata.mavenFacet.parent.version;
+
+      window.sammyArchivaApplication.setLocation(location);
+
     }
 
     breadCrumbEntries=function(){
@@ -316,8 +324,6 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
                   });
                   return;
                 }
-
-
                 if ($(e.target).attr("href")=="#artifact-details-files-content") {
                   displayArtifactFilesContent(self);
                 }
@@ -332,17 +338,37 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
 
 
     displayGroup=function(groupId){
-      var parentBrowseViewModel=new BrowseViewModel(null,null,null);
-      displayGroupDetail(groupId,parentBrowseViewModel,null);
+      var selectedRepo=getSelectedBrowsingRepository();
+      var location ="#browse";
+      if (selectedRepo){
+        location+="~"+selectedRepo;
+      }
+      location+="/"+groupId;
+
+      window.sammyArchivaApplication.setLocation(location);
     }
 
     displayArtifactDetailView=function(groupId, artifactId){
-      displayArtifactDetail(groupId, artifactId);
+      var selectedRepo=getSelectedBrowsingRepository();
+      var location ="#artifact";
+      if (selectedRepo){
+        location+="~"+selectedRepo;
+      }
+      location+="/"+groupId+"/"+artifactId;
+
+      window.sammyArchivaApplication.setLocation(location);
+
     }
 
     displayArtifactVersionDetailViewModel=function(groupId,artifactId,version){
-      var artifactVersionDetailViewModel = new ArtifactVersionDetailViewModel (groupId,artifactId,version)
-      artifactVersionDetailViewModel.display();
+      var selectedRepo=getSelectedBrowsingRepository();
+      var location ="#artifact";
+      if (selectedRepo){
+        location+="~"+selectedRepo;
+      }
+      location+="/"+groupId+"/"+artifactId+"/"+version;
+
+      window.sammyArchivaApplication.setLocation(location);
     }
 
 
@@ -594,8 +620,15 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
    * @param groupId
    */
   generalDisplayGroup=function(groupId) {
-    var parentBrowseViewModel=new BrowseViewModel(null,null,null);
-    displayGroupDetail(groupId,parentBrowseViewModel,null);
+    $.log("generalDisplayGroup");
+    var selectedRepo=getSelectedBrowsingRepository();
+    var location ="#browse";
+    if (selectedRepo){
+      location+="~"+selectedRepo;
+    }
+    location+="/"+groupId;
+
+    window.sammyArchivaApplication.setLocation(location);
   }
 
   /**
@@ -604,7 +637,14 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
    * @param artifactId
    */
   generalDisplayArtifactDetailView=function(groupId, artifactId){
-    displayArtifactDetail(groupId, artifactId);
+    var selectedRepo=getSelectedBrowsingRepository();
+    var location ="#artifact";
+    if (selectedRepo){
+      location+="~"+selectedRepo;
+    }
+    location+="/"+groupId+"/"+artifactId;
+
+    window.sammyArchivaApplication.setLocation(location);
   }
 
   /**
@@ -614,8 +654,14 @@ define("archiva.search",["jquery","i18n","jquery.tmpl","choosen","knockout","kno
    * @param version
    */
   generalDisplayArtifactVersionDetailViewModel=function(groupId,artifactId,version){
-    var artifactVersionDetailViewModel = new ArtifactVersionDetailViewModel (groupId,artifactId,version)
-    artifactVersionDetailViewModel.display();
+    var selectedRepo=getSelectedBrowsingRepository();
+    var location ="#artifact";
+    if (selectedRepo){
+      location+="~"+selectedRepo;
+    }
+    location+="/"+groupId+"/"+artifactId+"/"+version;
+
+    window.sammyArchivaApplication.setLocation(location);
   }
 
   goToBrowseArtifactDetail=function(groupId, artifactId,repositoryId){

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
index eb17a5896d9f053f2ada6758a0f2d2234ae1cb07..0b9183f53be79e230d9de304b37916b9fdf972c4 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
@@ -371,7 +371,6 @@
 <script id="search-results-view-grid-tmpl" type="text/html">
     <thead>
         <tr>
-
             <th title="${$.i18n.prop('search.artifact.results.groupId')}">${$.i18n.prop('search.artifact.results.groupId')}</th>
             <th title="${$.i18n.prop('search.artifact.results.artifactId')}">${$.i18n.prop('search.artifact.results.artifactId')}</th>
             <th title="${$.i18n.prop('search.artifact.results.version')}">${$.i18n.prop('search.artifact.results.version')}</th>