From 514da0237f6239322193d5d4b11b58fe4095da2b Mon Sep 17 00:00:00 2001
From: SHaselbauer <sarah.haselbauer@akquinet.de>
Date: Wed, 23 Jan 2013 10:27:42 -0500
Subject: [PATCH] seleniumFixV2: connected thread pool creation to condition web.allowLuceneIndexing (otherwise thread pool will be kept open for more than a minute, what hinders the start of another gitblit instance in the same jvm during selenium test case execution), fixed naming of xpath variables, added missing property to gitblit.properties and test-ui-gitblit.properties, changed naming of methods (according to decision that owners is a much shorter word than repository administrator and that owners is fits better if you think of collective responsibilities and collective ownership)
---
src/com/gitblit/wicket/panels/BranchesPanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java
index 1bdf451..1262077 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -65,16 +65,16 @@
user = UserModel.ANONYMOUS;
}
- List<RefModel> localBranches = JGitUtils.getLocalBranches(r, false, maxCount);
+ 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, maxCount);
+ 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