From fb9813874c811ae06604c30d875e9dce57df9874 Mon Sep 17 00:00:00 2001
From: SHaselbauer <sarah.haselbauer@akquinet.de>
Date: Mon, 21 Jan 2013 16:28:11 -0500
Subject: [PATCH] Merge multiple owners feature (pull request #63, #66)
---
src/com/gitblit/wicket/pages/RepositoryPage.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index aac527d..b67aaa6 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -79,7 +79,7 @@
private final Map<String, PageRegistration> registeredPages;
private boolean showAdmin;
- private boolean isOwner;
+ private boolean isRepoAdministrator;
public RepositoryPage(PageParameters params) {
super(params);
@@ -183,10 +183,10 @@
} else {
showAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, false);
}
- isOwner = GitBlitWebSession.get().isLoggedIn()
- && (model.owner != null && model.owner.equalsIgnoreCase(GitBlitWebSession.get()
+ isRepoAdministrator = GitBlitWebSession.get().isLoggedIn()
+ && (model.isRepoAdministrator(GitBlitWebSession.get()
.getUsername()));
- if (showAdmin || isOwner) {
+ if (showAdmin || isRepoAdministrator) {
pages.put("edit", new PageRegistration("gb.edit", EditRepositoryPage.class, params));
}
return pages;
@@ -540,7 +540,7 @@
}
public boolean isOwner() {
- return isOwner;
+ return isRepoAdministrator;
}
private class SearchForm extends SessionlessForm<Void> implements Serializable {
--
Gitblit v1.9.1