From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/wicket/panels/BranchesPanel.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java
index 26fedc1..1262077 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -67,14 +67,14 @@
List<RefModel> localBranches = JGitUtils.getLocalBranches(r, false, -1);
for (RefModel refModel : localBranches) {
- if (user.hasBranchPermission(model.name, refModel.reference.getName())) {
+ if (user.canView(model, refModel.reference.getName())) {
branches.add(refModel);
}
}
if (model.showRemoteBranches) {
List<RefModel> remoteBranches = JGitUtils.getRemoteBranches(r, false, -1);
for (RefModel refModel : remoteBranches) {
- if (user.hasBranchPermission(model.name, refModel.reference.getName())) {
+ if (user.canView(model, refModel.reference.getName())) {
branches.add(refModel);
}
}
--
Gitblit v1.9.1