diff options
| author | James Moger <james.moger@gitblit.com> | 2013-03-28 16:42:12 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-03-28 16:42:12 -0400 |
| commit | 66a8db8f81165ea3ab5cdab0f7ca9dd3e6c20d1a (patch) | |
| tree | f9839743479c0cad13492de096191bb70c331e83 /src/main/java | |
| parent | 3cfb7a493646d47e1d78ef614a3ca2fc9d60e33e (diff) | |
| download | gitblit-66a8db8f81165ea3ab5cdab0f7ca9dd3e6c20d1a.tar.gz gitblit-66a8db8f81165ea3ab5cdab0f7ca9dd3e6c20d1a.zip | |
Fixed internal error on folder history links (issue 192)
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java index e5878635..4d275892 100644 --- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java @@ -109,13 +109,13 @@ public class HistoryPanel extends BasePanel { }
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 {
|