Merge release 1.6.0

1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
index 299d8dbc..f3d0bc92 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java
@@ -24,10 +24,12 @@ import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.image.Image;

 import org.apache.wicket.markup.html.link.BookmarkablePageLink;

+import org.apache.wicket.markup.html.link.ExternalLink;

 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

 

 import com.gitblit.Keys;

+import com.gitblit.servlet.RawServlet;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.CacheControl;

@@ -57,8 +59,8 @@ public class BlobPage extends RepositoryPage {
 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath))

 					.setEnabled(false));

 			add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class).setEnabled(false));

-			add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

-					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

+			String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, blobPath);

+			add(new ExternalLink("rawLink",  rawUrl));

 			add(new CommitHeaderPanel("commitHeader", objectId));

 			add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, blobPath, objectId));

 			Component c = new Label("blobText", JGitUtils.getStringContent(r, objectId, encodings));

@@ -87,8 +89,8 @@ public class BlobPage extends RepositoryPage {
 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

 			add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,

 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

-			add(new BookmarkablePageLink<Void>("rawLink", RawPage.class,

-					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

+			String rawUrl = RawServlet.asLink(getContextUrl(), repositoryName, objectId, blobPath);

+			add(new ExternalLink("rawLink", rawUrl));

 

 			add(new CommitHeaderPanel("commitHeader", repositoryName, commit));

 

@@ -115,7 +117,7 @@ public class BlobPage extends RepositoryPage {
 				case 2:

 					// image blobs

 					add(new Label("blobText").setVisible(false));

-					add(new ExternalImage("blobImage", urlFor(RawPage.class, WicketUtils.newPathParameter(repositoryName, objectId, blobPath)).toString()));

+					add(new ExternalImage("blobImage", rawUrl));

 					break;

 				case 3:

 					// binary blobs