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

fix issue when artifact-used-by is call directly in the browser 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1371490 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-08-09 21:13:38 +00:00
parent ab3edfb450
commit 273aeb97a7
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,8 +248,9 @@ function() {
var checkArtifactDetailContent=function(groupId,artifactId,version,repositoryId,tabToActivate,idContentToCheck,contentDisplayFn){ var checkArtifactDetailContent=function(groupId,artifactId,version,repositoryId,tabToActivate,idContentToCheck,contentDisplayFn){
// no need to recalculate all stuff just activate the tab // no need to recalculate all stuff just activate the tab
var htmlId = idContentToCheck?idContentToCheck:"browse_artifact_detail"; var htmlId = idContentToCheck?idContentToCheck:"browse_artifact_detail";
if($("#main-content #"+htmlId ).html()!=null){ var htmlIdSelect = $("#main-content #"+htmlId );
if( $.trim($("#browse_artifact_detail" ).html().length)>0){ if(htmlIdSelect.html()!=null){
if( $.trim(htmlIdSelect.html().length)>0){
$("#main-content #"+tabToActivate).tab('show') $("#main-content #"+tabToActivate).tab('show')
return; return;
} }
@ -258,7 +259,7 @@ function() {
function(){ function(){
$("#main-content #"+tabToActivate).tab('show') $("#main-content #"+tabToActivate).tab('show')
if(contentDisplayFn){ if(contentDisplayFn){
contentDisplayFn(); contentDisplayFn(groupId,artifactId,version);
} }
} }
); );
@ -320,14 +321,8 @@ function() {
checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-dependency-tree-content-a"); checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-dependency-tree-content-a");
}); });
this.get('#artifact-used-by/:groupId/:artifactId/:version',function(context){
var repositoryId = this.params.repositoryId; var calculateUsedBy=function(groupId,artifactId,version){
var groupId= this.params.groupId;
var artifactId= this.params.artifactId;
var version= this.params.version;
var calculateUsedBy=function(){
var dependeesContentDiv=$("#main-content #artifact-details-used-by-content" ); var dependeesContentDiv=$("#main-content #artifact-details-used-by-content" );
if( $.trim(dependeesContentDiv.html()).length<1){ if( $.trim(dependeesContentDiv.html()).length<1){
dependeesContentDiv.html(mediumSpinnerImg()); dependeesContentDiv.html(mediumSpinnerImg());
@ -349,6 +344,12 @@ function() {
} }
} }
this.get('#artifact-used-by/:groupId/:artifactId/:version',function(context){
var repositoryId = this.params.repositoryId;
var groupId= this.params.groupId;
var artifactId= this.params.artifactId;
var version= this.params.version;
checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-used-by-content-a","artifact-details-used-by-content",calculateUsedBy); checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-used-by-content-a","artifact-details-used-by-content",calculateUsedBy);
}); });
@ -358,7 +359,7 @@ function() {
var groupId= this.params.groupId; var groupId= this.params.groupId;
var artifactId= this.params.artifactId; var artifactId= this.params.artifactId;
var version= this.params.version; var version= this.params.version;
checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-used-by-content-a"); checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-used-by-content-a","artifact-details-used-by-content",calculateUsedBy);
}); });