From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Feb 2014 15:54:43 +0000 (-0500)
Subject: Fix regression in blame page due to issue-2, pr-125
X-Git-Tag: v1.4.0~98
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=15e5605a902a9292b3d9008375347d076514711b;p=gitblit.git

Fix regression in blame page due to issue-2, pr-125
---

diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.html b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
index ffd2a03b..1da9671b 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlamePage.html
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.html
@@ -30,7 +30,7 @@
 					</span>
 				</td>
 			</tr>
-			<tr wicket:id="blameView">
+			<tr wicket:id="annotation">
 				<td class="lineCommit"><span class="sha1" wicket:id="commit"></span></td>
 				<td class="lineNumber"><span class="sha1" wicket:id="line"></span></td>
 				<td class="lineContent sha1" wicket:id="data"></td>
diff --git a/src/main/java/com/gitblit/wicket/pages/BlamePage.java b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
index ef023b75..ae85c433 100644
--- a/src/main/java/com/gitblit/wicket/pages/BlamePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BlamePage.java
@@ -147,6 +147,9 @@ public class BlamePage extends RepositoryPage {
 		}
 
 		if (pathModel == null) {
+			final String notFound = MessageFormat.format("Blame page failed to find {0} in {1} @ {2}",
+					blobPath, repositoryName, objectId);
+			logger.error(notFound);
 			add(new Label("annotation").setVisible(false));
 			add(new Label("missingBlob", missingBlob(blobPath, commit)).setEscapeModelStrings(false));
 			return;
@@ -157,7 +160,7 @@ public class BlamePage extends RepositoryPage {
 		List<AnnotatedLine> lines = DiffUtils.blame(getRepository(), blobPath, objectId);
 		final Map<?, String> colorMap = initializeColors(activeBlameType, lines);
 		ListDataProvider<AnnotatedLine> blameDp = new ListDataProvider<AnnotatedLine>(lines);
-		DataView<AnnotatedLine> blameView = new DataView<AnnotatedLine>("blameView", blameDp) {
+		DataView<AnnotatedLine> blameView = new DataView<AnnotatedLine>("annotation", blameDp) {
 			private static final long serialVersionUID = 1L;
 			private String lastCommitId = "";
 			private boolean showInitials = true;