Author: olamy
Date: Tue May 29 16:35:00 2012
New Revision: 1343828
URL: http://svn.apache.org/viewvc?rev=1343828&view=rev
Log:
[MRM-1621] add download box in artifact detail for new ui.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
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-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1343828&r1=1343827&r2=1343828&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
Tue May 29 16:35:00 2012
@@ -23,6 +23,7 @@ import org.apache.archiva.admin.model.Re
import org.apache.archiva.admin.model.admin.ArchivaAdministration;
import org.apache.archiva.audit.AuditEvent;
import org.apache.archiva.audit.AuditListener;
+import org.apache.archiva.common.utils.VersionUtil;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import
org.apache.archiva.redback.rest.services.RedbackAuthenticationThreadLocal;
import org.apache.archiva.redback.rest.services.RedbackRequestInformation;
@@ -196,7 +197,14 @@ public abstract class AbstractRestServic
sb.append( '/' ).append( StringUtils.replaceChars(
artifact.getGroupId(), '.', '/' ) );
sb.append( '/' ).append( artifact.getArtifactId() );
- sb.append( '/' ).append( artifact.getVersion() );
+ if ( VersionUtil.isSnapshot( artifact.getVersion() ) )
+ {
+ sb.append( '/' ).append( VersionUtil.getBaseVersion(
artifact.getVersion() ) );
+ }
+ else
+ {
+ sb.append( '/' ).append( artifact.getVersion() );
+ }
sb.append( '/' ).append( artifact.getArtifactId() );
sb.append( '-' ).append( artifact.getVersion() );
if ( StringUtils.isNotBlank( artifact.getClassifier() ) )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1343828&r1=1343827&r2=1343828&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Tue May 29 16:35:00 2012
@@ -688,7 +688,7 @@ public class DefaultBrowseService
repositoryContentFactory.getManagedRepositoryContent( repoId ) );
Artifact art = builder.build();
- art.setUrl( getArtifactUrl( art, artifact.getVersion() ) );
+ art.setUrl( getArtifactUrl( art, version ) );
artifactDownloadInfos.add( art );
}
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=1343828&r1=1343827&r2=1343828&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 May 29 16:35:00 2012
@@ -224,6 +224,7 @@ define("search",["jquery","i18n","jquery
}
});
}
+ return;
}
if
($(e.target).attr("href")=="#artifact-details-used-by-content") {
var
dependeesContentDiv=mainContent.find("#artifact-details-used-by-content" );
@@ -245,6 +246,7 @@ define("search",["jquery","i18n","jquery
}
});
}
+ return;
}
if
($(e.target).attr("href")=="#artifact-details-metadatas-content") {
@@ -267,8 +269,23 @@ define("search",["jquery","i18n","jquery
self.entries(entries);
}
});
+ return;
}
+ if
($(e.target).attr("href")=="#artifact-details-download-content") {
+ $.log("artifact metadata");
+ //
+ mainContent.find("#artifact-details-download-content"
).html(smallSpinnerImg());
+ var artifactDownloadInfosUrl =
"restServices/archivaServices/browseService/artifactDownloadInfos/"+encodeURIComponent(self.groupId);
+
artifactDownloadInfosUrl+="/"+encodeURIComponent(self.artifactId)+"/"+encodeURIComponent(self.version);
+
artifactDownloadInfosUrl+="?repositoryId="+encodeURIComponent(getSelectedBrowsingRepository());
+ $.get(artifactDownloadInfosUrl,function(data){
+ $("#artifact-details-download-content"
).html($("#artifact-details-download-content_tmpl").tmpl({artifactDownloadInfos:data}));
+ });
+ return;
+ }
+
+
if
($(e.target).attr("href")=="#artifact-details-files-content") {
mainContent.find("#artifact-details-files-content"
).html(smallSpinnerImg());
var artifactDownloadInfosUrl =
"restServices/archivaServices/browseService/artifactDownloadInfos/"+encodeURIComponent(self.groupId);
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=1343828&r1=1343827&r2=1343828&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 May 29 16:35:00 2012
@@ -435,6 +435,9 @@
<a data-toggle="tab"
href="#artifact-details-files-content">${$.i18n.prop('artifact.detail.tab.header.file.content')}</a>
</li>
<li>
+ <a data-toggle="tab"
href="#artifact-details-download-content">${$.i18n.prop('artifact.detail.tab.header.file.download')}</a>
+ </li>
+ <li>
<a data-toggle="tab"
href="#artifact-details-used-by-content">${$.i18n.prop('artifact.detail.tab.header.used.by')}</a>
</li>
<li>
@@ -628,7 +631,9 @@
</div>
<div id="artifact-details-files-content" class="tab-pane">
+ </div>
+ <div id="artifact-details-download-content" class="tab-pane">
</div>
<div id="artifact-details-used-by-content" class="tab-pane"></div>
@@ -826,4 +831,14 @@
<div class="source">
<pre class="prettyprint linenums" id="artifact-content-text"></pre>
</div>
+</script>
+
+<script id="artifact-details-download-content_tmpl" type="text/html">
+ <ul id="artifact-download-list-files">
+ {{each artifactDownloadInfos}}
+ <li>
+ <a
href="${$value.url}">${$value.packaging}:${$value.version} - ${$value.size}</a>
+ </li>
+ {{/each}}
+ </ul>
</script>
\ No newline at end of file
