From 7f70511e9a13f4801e4e941affad6fc7b579c79d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 10 Oct 2012 22:29:36 -0400
Subject: [PATCH] Support Team canAdmin, canCreate, and canFork (issue 36)
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index f7427eb..8176c28 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -83,7 +83,7 @@
GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();
- if (user != null && user.canCreate && !user.canAdmin) {
+ if (user != null && user.canCreate() && !user.canAdmin()) {
// personal create permissions, inject personal repository path
model.name = user.getPersonalPath() + "/";
model.projectPath = user.getPersonalPath();
@@ -120,7 +120,7 @@
final UserModel user = session.getUser() == null ? UserModel.ANONYMOUS : session.getUser();
if (isCreate) {
- if (user.canAdmin) {
+ if (user.canAdmin()) {
super.setupPage(getString("gb.newRepository"), "");
} else {
super.setupPage(getString("gb.newRepository"), user.getDisplayName());
@@ -253,7 +253,7 @@
return;
}
- if (user.canCreate && !user.canAdmin) {
+ if (user.canCreate() && !user.canAdmin()) {
// ensure repository name begins with the user's path
if (!repositoryModel.name.startsWith(user.getPersonalPath())) {
error(MessageFormat.format(getString("gb.illegalPersonalRepositoryLocation"),
@@ -474,13 +474,13 @@
}
if (isCreate) {
// Create Repository
- if (!user.canCreate && !user.canAdmin) {
+ if (!user.canCreate() && !user.canAdmin()) {
// Only administrators or permitted users may create
error(getString("gb.errorOnlyAdminMayCreateRepository"), true);
}
} else {
// Edit Repository
- if (user.canAdmin) {
+ if (user.canAdmin()) {
// Admins can edit everything
isAdmin = true;
return;
--
Gitblit v1.9.1