Author: olamy
Date: Fri Mar 16 16:09:05 2012
New Revision: 1301617
URL: http://svn.apache.org/viewvc?rev=1301617&view=rev
Log:
if available display project packaging
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/archiva/templates/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=1301617&r1=1301616&r2=1301617&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
Fri Mar 16 16:09:05 2012
@@ -444,12 +444,29 @@ $(function() {
}):[data.dependencies];
projectVersionMetadata.dependencies=dependencies;
}
-
$.log("projectVersionMetadata.issueManagement.system:"+(projectVersionMetadata.issueManagement?projectVersionMetadata.issueManagement.system:"null"));
+ // maven facet currently only for packaging
+ if(data.facetList){
+ if( $.isArray(data.facetList)){
+ for (var i=0;i<data.facetList.length;i++){
+
if(data.facetList[i].facetId=='org.apache.archiva.metadata.repository.storage.maven2.project'){
+ projectVersionMetadata.mavenFacet=new
MavenFacet(data.facetList[i].packaging);
+ }
+ }
+ } else {
+
if(data.facetList.facetId=='org.apache.archiva.metadata.repository.storage.maven2.project'){
+ projectVersionMetadata.mavenFacet=new
MavenFacet(data.facetList.packaging);
+ }
+ }
+ }
return projectVersionMetadata;
}
return null;
}
+ MavenFacet=function(packaging){
+ this.packaging=packaging;
+ }
+
ProjectVersionMetadata=function(id,url,name,description,organization,issueManagement,scm,ciManagement,licenses,
mailingLists,dependencies,incomplete){
// private String id;
@@ -488,6 +505,8 @@ $(function() {
//private boolean incomplete;
this.incomplete=incomplete;
+ this.mavenFacet=null;
+
}
Organization=function(name,url){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1301617&r1=1301616&r2=1301617&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Fri Mar 16 16:09:05 2012
@@ -114,6 +114,12 @@
<th>${$.i18n.prop('browse.artifact.description')}</th>
<td>${projectVersionMetadata.description}</td>
</tr>
+ {{if projectVersionMetadata.mavenFacet}}
+ <tr>
+ <th>${$.i18n.prop('browse.artifact.packaging')}</th>
+ <td>${projectVersionMetadata.mavenFacet.packaging}</td>
+ </tr>
+ {{/if}}
{{if projectVersionMetadata.organization}}
<tr>
<th>${$.i18n.prop('browse.artifact.organization.name')}</th>
