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/client/RegistrantPermissionsTableModel.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/client/RegistrantPermissionsTableModel.java b/src/com/gitblit/client/RegistrantPermissionsTableModel.java
index fcd9c8b..28d2534 100644
--- a/src/com/gitblit/client/RegistrantPermissionsTableModel.java
+++ b/src/com/gitblit/client/RegistrantPermissionsTableModel.java
@@ -91,7 +91,7 @@
if (columnIndex == Columns.Permission.ordinal()) {
return AccessPermission.class;
} else if (columnIndex == Columns.Type.ordinal()) {
- return Boolean.class;
+ return RegistrantAccessPermission.class;
}
return String.class;
}
@@ -104,7 +104,7 @@
// and therefore can not be directly manipulated unless the current
// object is the source of the regex (i.e. a user or team with explicit
// regex definition)
- return permissions.get(rowIndex).isExplicit;
+ return permissions.get(rowIndex).mutable;
}
return false;
}
@@ -117,7 +117,7 @@
case Registrant:
return rp.registrant;
case Type:
- return rp.isExplicit;
+ return rp;
case Permission:
return rp.permission;
}
--
Gitblit v1.9.1