diff options
| author | James Moger <james.moger@gitblit.com> | 2014-02-28 10:54:43 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-02-28 11:25:55 -0500 |
| commit | 15e5605a902a9292b3d9008375347d076514711b (patch) | |
| tree | 89f057f0fd1018de9d6d393a64dc798dd6fd1d3b /src | |
| parent | 3d096fee8d8f7dae9ba4801480f775285227d9f6 (diff) | |
| download | gitblit-15e5605a902a9292b3d9008375347d076514711b.tar.gz gitblit-15e5605a902a9292b3d9008375347d076514711b.zip | |
Fix regression in blame page due to issue-2, pr-125
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/BlamePage.html | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/BlamePage.java | 5 |
2 files changed, 5 insertions, 2 deletions
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;
|