Skip to content

The Unified and Autonomous Development Platform

Fix issue #1151 - download button for files in web ui

Robin Shenfd50b3f8ef2f
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
index 89824b9924..adff133d7d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
@@ -29,8 +29,8 @@
</a>
</span>
</wicket:container>
- <a wicket:id="raw" class="btn btn-xs btn-light btn-hover-primary btn-icon" title="Raw">
- <wicket:svg href="file" class="icon"></wicket:svg>
+ <a wicket:id="download" class="btn btn-xs btn-light btn-hover-primary btn-icon" title="Download">
+ <wicket:svg href="download2" class="icon"></wicket:svg>
</a>
</div>
<!-- Put all options in a single line to make :empty selector working -->
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index 7d14519db7..d77ad0294f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -34,6 +34,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
import io.onedev.server.web.resource.RawBlobResource;
import io.onedev.server.web.resource.RawBlobResourceReference;
+import org.apache.wicket.request.resource.ContentDisposition;
@SuppressWarnings("serial")
public abstract class BlobViewPanel extends Panel {
@@ -229,8 +230,8 @@ public abstract class BlobViewPanel extends Panel {
add(newFormats("formats"));
- add(new ResourceLink<Void>("raw", new RawBlobResourceReference(),
- RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent())));
+ add(new ResourceLink<Void>("download", new RawBlobResourceReference(),
+ RawBlobResource.paramsOf(context.getProject(), context.getBlobIdent(), ContentDisposition.ATTACHMENT)));
add(new CheckBox("viewPlain", Model.of(context.getMode() == Mode.VIEW && context.isViewPlain())) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
index 9c93795143..9223002f53 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import javax.annotation.Nullable;
import javax.persistence.EntityNotFoundException;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
@@ -22,6 +23,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.UnauthorizedException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
+import org.apache.wicket.request.resource.ContentDisposition;
import org.eclipse.jetty.io.EofException;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
@@ -51,6 +53,8 @@ public class RawBlobResource extends AbstractResource {
private static final long serialVersionUID = 1L;
+ private static final String PARAM_DISPOSITION = "disposition";
+
private static final Logger logger = LoggerFactory.getLogger(RawBlobResource.class);
@Override
@@ -99,7 +103,11 @@ public class RawBlobResource extends AbstractResource {
} catch (UnsupportedEncodingException e) {
throw new RuntimeException(e);
}
-
+
+ String disposition = params.get(PARAM_DISPOSITION).toOptionalString();
+ if (disposition != null)
+ response.setContentDisposition(ContentDisposition.valueOf(disposition));
+
response.setWriteCallback(new WriteCallback() {
@Override
@@ -179,10 +187,17 @@ public class RawBlobResource extends AbstractResource {
private ClusterManager getClusterManager() {
return OneDev.getInstance(ClusterManager.class);
}
-
+
public static PageParameters paramsOf(Project project, BlobIdent blobIdent) {
+ return paramsOf(project, blobIdent, null);
+ }
+
+ public static PageParameters paramsOf(Project project, BlobIdent blobIdent,
+ @Nullable ContentDisposition disposition) {
PageParameters params = new PageParameters();
params.set(ProjectMapperUtils.PARAM_PROJECT, project.getPath());
+ if (disposition != null)
+ params.add(PARAM_DISPOSITION, disposition.name());
int index = 0;
for (String segment: Splitter.on("/").split(blobIdent.revision)) {