From 59f09bdd4536dc3584c779c3985e4ff49d4a7e69 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Mar 2013 08:38:20 -0400
Subject: [PATCH] Disable view and blame links for deleted blobs (issue 216)
---
releases.moxie | 1 +
src/main/java/com/gitblit/wicket/pages/CommitPage.java | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 535c7ec..6a61d28 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@
- Fix internal error on folder history links (issue 192)
- Fixed incorrect icon file name for .doc files (issue 200)
- Do not queue emails with no recipients (issue 201)
+ - Disable view and blame links for deleted blobs (issue 216)
- Fixed extracting Groovy scripts on Express installs (issue 220)
- Use standard ServletRequestWrapper instead of custom wrapper (issue 224)
diff --git a/src/main/java/com/gitblit/wicket/pages/CommitPage.java b/src/main/java/com/gitblit/wicket/pages/CommitPage.java
index c5a24c8..540d2a2 100644
--- a/src/main/java/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/CommitPage.java
@@ -200,10 +200,12 @@
.setEnabled(!entry.changeType.equals(ChangeType.ADD)
&& !entry.changeType.equals(ChangeType.DELETE)));
item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils
- .newPathParameter(repositoryName, entry.commitId, entry.path)));
+ .newPathParameter(repositoryName, entry.commitId, entry.path))
+ .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));
item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path))
- .setEnabled(!entry.changeType.equals(ChangeType.ADD)));
+ .setEnabled(!entry.changeType.equals(ChangeType.ADD)
+ && !entry.changeType.equals(ChangeType.DELETE)));
item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils
.newPathParameter(repositoryName, entry.commitId, entry.path))
.setEnabled(!entry.changeType.equals(ChangeType.ADD)));
--
Gitblit v1.9.1