Disable view and blame links for deleted blobs (issue 216)

diff --git a/releases.moxie b/releases.moxie
index 535c7ecf708bd0855e3df7fcfb8ce5ae725802dc..6a61d28eefefdf904ab30ac1ff513cad9c668b50 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -11,6 +11,7 @@ r17: {
         - Fix internal error on folder history links (issue 192)\r
         - Fixed incorrect icon file name for .doc files (issue 200)\r
         - Do not queue emails with no recipients (issue 201)\r
+        - Disable view and blame links for deleted blobs (issue 216)\r
         - Fixed extracting Groovy scripts on Express installs (issue 220)\r
         - Use standard ServletRequestWrapper instead of custom wrapper (issue 224)\r
 \r

diff --git a/src/main/java/com/gitblit/wicket/pages/CommitPage.java b/src/main/java/com/gitblit/wicket/pages/CommitPage.java
index c5a24c8d86ada91556a16fa744b8e01f266812bd..540d2a213dad744f186ebbea0551375b1dbda620 100644 (file)
--- 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)\r
                                                                        && !entry.changeType.equals(ChangeType.DELETE)));\r
                                        item.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils\r
-                                                       .newPathParameter(repositoryName, entry.commitId, entry.path)));\r
+                                                       .newPathParameter(repositoryName, entry.commitId, entry.path))\r
+                                                       .setEnabled(!entry.changeType.equals(ChangeType.DELETE)));\r
                                        item.add(new BookmarkablePageLink<Void>("blame", BlamePage.class, WicketUtils\r
                                                        .newPathParameter(repositoryName, entry.commitId, entry.path))\r
-                                                       .setEnabled(!entry.changeType.equals(ChangeType.ADD)));\r
+                                                       .setEnabled(!entry.changeType.equals(ChangeType.ADD)\r
+                                                                       && !entry.changeType.equals(ChangeType.DELETE)));\r
                                        item.add(new BookmarkablePageLink<Void>("history", HistoryPage.class, WicketUtils\r
                                                        .newPathParameter(repositoryName, entry.commitId, entry.path))\r
                                                        .setEnabled(!entry.changeType.equals(ChangeType.ADD)));\r