From 9715e11fe30eccafa4c8272316883c80ba036a6e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 May 2013 22:59:02 -0400
Subject: [PATCH] Improve permission determination when repo is frozen or is not bare
---
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index e587863..e2b7e72 100644
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -42,9 +42,9 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel;
-import com.gitblit.models.SubmoduleModel;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
+import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
@@ -109,13 +109,13 @@
}
final boolean isTree = matchingPath == null ? true : matchingPath.isTree();
- final boolean isSubmodule = matchingPath == null ? true : matchingPath.isSubmodule();
+ final boolean isSubmodule = matchingPath == null ? false : matchingPath.isSubmodule();
// submodule
- SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath.path);
final String submodulePath;
final boolean hasSubmodule;
- if (submodule != null) {
+ if (isSubmodule) {
+ SubmoduleModel submodule = getSubmodule(submodules, repositoryName, matchingPath == null ? null : matchingPath.path);
submodulePath = submodule.gitblitPath;
hasSubmodule = submodule.hasSubmodule;
} else {
--
Gitblit v1.9.1