Author: olamy
Date: Tue Aug 7 21:22:32 2012
New Revision: 1370531
URL: http://svn.apache.org/viewvc?rev=1370531&view=rev
Log:
fix navigation missing when using crumbentries
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1370531&r1=1370530&r2=1370531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
Tue Aug 7 21:22:32 2012
@@ -155,8 +155,6 @@ define("archiva.search",["jquery","i18n"
}
displayArtifactVersionDetail=function(version){
- //var artifactVersionDetailViewModel=new
ArtifactVersionDetailViewModel(self.groupId,self.artifactId,version,getSelectedBrowsingRepository());
- //artifactVersionDetailViewModel.display();
var selectedRepo=getSelectedBrowsingRepository();
var location ="#artifact";
if (selectedRepo){
@@ -651,6 +649,17 @@ define("archiva.search",["jquery","i18n"
}
+ goToArtifactDetail=function(groupId,artifactId){
+ var selectedRepo=getSelectedBrowsingRepository();
+ var location ="#artifact";
+ if (selectedRepo){
+ location+="~"+selectedRepo;
+ }
+ location+="/"+groupId+"/"+artifactId;
+
+ window.sammyArchivaApplication.setLocation(location);
+ }
+
/**
*
* @param groupId
@@ -1423,7 +1432,6 @@ define("archiva.search",["jquery","i18n"
location+="/"+artifact.groupId+"/"+artifact.artifactId+"/"+artifact.version;
window.sammyArchivaApplication.setLocation(location);
-
//generalDisplayArtifactDetailsVersionView(artifact.groupId,artifact.artifactId,artifact.version,null);
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1370531&r1=1370530&r2=1370531&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Tue Aug 7 21:22:32 2012
@@ -74,7 +74,7 @@
${breadCrumbEntry.displayValue}
{{else}}
{{if breadCrumbEntry.artifact}}
- <a href="#" data-bind="click:
function(){displayArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId,null,null)}">${breadCrumbEntry.displayValue}</a>
+ <a href="#" data-bind="click:
function(){goToArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId)}">${breadCrumbEntry.displayValue}</a>
{{else}}
<a href="#" data-bind="click:
function(){displayGroupId(breadCrumbEntry.groupId)}">${breadCrumbEntry.displayValue}</a>
{{/if}}
