summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2013-03-29 08:38:20 -0400
committerJames Moger <james.moger@gitblit.com>2013-03-29 08:38:20 -0400
commit59f09bdd4536dc3584c779c3985e4ff49d4a7e69 (patch)
tree4f4c933e385037a08cceb1e6b506154b0271865e
parent5a768089d86839bc352299567aa782fc42f4e109 (diff)
downloadgitblit-59f09bdd4536dc3584c779c3985e4ff49d4a7e69.tar.gz
gitblit-59f09bdd4536dc3584c779c3985e4ff49d4a7e69.zip
Disable view and blame links for deleted blobs (issue 216)
-rw-r--r--releases.moxie1
-rw-r--r--src/main/java/com/gitblit/wicket/pages/CommitPage.java6
2 files changed, 5 insertions, 2 deletions
diff --git a/releases.moxie b/releases.moxie
index 535c7ecf..6a61d28e 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@ r17: {
- 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 c5a24c8d..540d2a21 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 @@ public class CommitPage extends RepositoryPage {
.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)));