Support Team canAdmin, canCreate, and canFork (issue 36)

20 files changed, 150 insertions, 30 deletions

diff --git a/src/com/gitblit/AccessRestrictionFilter.java b/src/com/gitblit/AccessRestrictionFilter.java
index aeb6835c..3a104813 100644
--- a/src/com/gitblit/AccessRestrictionFilter.java
+++ b/src/com/gitblit/AccessRestrictionFilter.java
@@ -156,7 +156,7 @@ public abstract class AccessRestrictionFilter extends AuthenticationFilter {
 				return;

 			} else {

 				// check user access for request

-				if (user.canAdmin || canAccess(model, user, urlRequestType)) {

+				if (user.canAdmin() || canAccess(model, user, urlRequestType)) {

 					// authenticated request permitted.

 					// pass processing to the restricted servlet.

 					newSession(authenticatedRequest, httpResponse);

diff --git a/src/com/gitblit/AuthenticationFilter.java b/src/com/gitblit/AuthenticationFilter.java
index 259991c9..4762c428 100644
--- a/src/com/gitblit/AuthenticationFilter.java
+++ b/src/com/gitblit/AuthenticationFilter.java
@@ -189,7 +189,7 @@ public abstract class AuthenticationFilter implements Filter {
 		@Override

 		public boolean isUserInRole(String role) {

 			if (role.equals(Constants.ADMIN_ROLE)) {

-				return user.canAdmin;

+				return user.canAdmin();

 			}

 			// Gitblit does not currently use actual roles in the traditional

 			// servlet container sense.  That is the reason this is marked

diff --git a/src/com/gitblit/ConfigUserService.java b/src/com/gitblit/ConfigUserService.java
index d2740094..82cd33e3 100644
--- a/src/com/gitblit/ConfigUserService.java
+++ b/src/com/gitblit/ConfigUserService.java
@@ -862,6 +862,24 @@ public class ConfigUserService implements IUserService {
 

 		// write teams

 		for (TeamModel model : teams.values()) {

+			// team roles

+			List<String> roles = new ArrayList<String>();

+			if (model.canAdmin) {

+				roles.add(Constants.ADMIN_ROLE);

+			}

+			if (model.canFork) {

+				roles.add(Constants.FORK_ROLE);

+			}

+			if (model.canCreate) {

+				roles.add(Constants.CREATE_ROLE);

+			}

+			if (roles.size() == 0) {

+				// we do this to ensure that team record is written.

+				// Otherwise, StoredConfig might optimizes that record away.

+				roles.add(Constants.NO_ROLE);

+			}

+			config.setStringList(TEAM, model.name, ROLE, roles);

+			

 			if (model.permissions == null) {

 				// null check on "final" repositories because JSON-sourced TeamModel

 				// can have a null repositories object

@@ -982,6 +1000,12 @@ public class ConfigUserService implements IUserService {
 				Set<String> teamnames = config.getSubsections(TEAM);

 				for (String teamname : teamnames) {

 					TeamModel team = new TeamModel(teamname);

+					Set<String> roles = new HashSet<String>(Arrays.asList(config.getStringList(

+							TEAM, teamname, ROLE)));

+					team.canAdmin = roles.contains(Constants.ADMIN_ROLE);

+					team.canFork = roles.contains(Constants.FORK_ROLE);

+					team.canCreate = roles.contains(Constants.CREATE_ROLE);

+					

 					team.addRepositoryPermissions(Arrays.asList(config.getStringList(TEAM, teamname,

 							REPOSITORY)));

 					team.addUsers(Arrays.asList(config.getStringList(TEAM, teamname, USER)));

diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java
index c06266dc..d411b68f 100644
--- a/src/com/gitblit/FileUserService.java
+++ b/src/com/gitblit/FileUserService.java
@@ -780,6 +780,20 @@ public class FileUserService extends FileSettings implements IUserService {
 						} else if (role.charAt(0) == '%') {

 							postReceive.add(role.substring(1));

 						} else {

+							switch (role.charAt(0)) {

+							case '#':

+								// Permissions

+								if (role.equalsIgnoreCase(Constants.ADMIN_ROLE)) {

+									team.canAdmin = true;

+								} else if (role.equalsIgnoreCase(Constants.FORK_ROLE)) {

+									team.canFork = true;

+								} else if (role.equalsIgnoreCase(Constants.CREATE_ROLE)) {

+									team.canCreate = true;

+								}

+								break;

+							default:

+								repositories.add(role);

+							}

 							repositories.add(role);

 						}

 					}

@@ -1040,6 +1054,17 @@ public class FileUserService extends FileSettings implements IUserService {
 			}

 		}

 		

+		// Permissions

+		if (model.canAdmin) {

+			roles.add(Constants.ADMIN_ROLE);

+		}

+		if (model.canFork) {

+			roles.add(Constants.FORK_ROLE);

+		}

+		if (model.canCreate) {

+			roles.add(Constants.CREATE_ROLE);

+		}

+

 		for (String role : roles) {

 				sb.append(role);

 				sb.append(',');

diff --git a/src/com/gitblit/RpcFilter.java b/src/com/gitblit/RpcFilter.java
index 4c0f03df..1de9fcc4 100644
--- a/src/com/gitblit/RpcFilter.java
+++ b/src/com/gitblit/RpcFilter.java
@@ -105,7 +105,7 @@ public class RpcFilter extends AuthenticationFilter {
 				return;

 			} else {

 				// check user access for request

-				if (user.canAdmin || canAccess(user, requestType)) {

+				if (user.canAdmin() || canAccess(user, requestType)) {

 					// authenticated request permitted.

 					// pass processing to the restricted servlet.

 					newSession(authenticatedRequest, httpResponse);

@@ -140,7 +140,7 @@ public class RpcFilter extends AuthenticationFilter {
 		case LIST_REPOSITORIES:

 			return true;

 		default:

-			return user.canAdmin;

+			return user.canAdmin();

 		}

 	}

 }
\ No newline at end of file
diff --git a/src/com/gitblit/RpcServlet.java b/src/com/gitblit/RpcServlet.java
index ff98ff55..2a6ba26c 100644
--- a/src/com/gitblit/RpcServlet.java
+++ b/src/com/gitblit/RpcServlet.java
@@ -73,10 +73,10 @@ public class RpcServlet extends JsonServlet {
 

 		UserModel user = (UserModel) request.getUserPrincipal();

 

-		boolean allowManagement = user != null && user.canAdmin

+		boolean allowManagement = user != null && user.canAdmin()

 				&& GitBlit.getBoolean(Keys.web.enableRpcManagement, false);

 

-		boolean allowAdmin = user != null && user.canAdmin

+		boolean allowAdmin = user != null && user.canAdmin()

 				&& GitBlit.getBoolean(Keys.web.enableRpcAdministration, false);

 

 		Object result = null;

diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index c05230ea..f635f7e8 100644
--- a/src/com/gitblit/client/UsersTableModel.java
+++ b/src/com/gitblit/client/UsersTableModel.java
@@ -102,7 +102,7 @@ public class UsersTableModel extends AbstractTableModel {
 		case Display_Name:

 			return model.displayName;

 		case AccessLevel:

-			if (model.canAdmin) {

+			if (model.canAdmin()) {

 				return "administrator";

 			}

 			return "";

diff --git a/src/com/gitblit/models/TeamModel.java b/src/com/gitblit/models/TeamModel.java
index 896adfe6..149c7659 100644
--- a/src/com/gitblit/models/TeamModel.java
+++ b/src/com/gitblit/models/TeamModel.java
@@ -41,6 +41,9 @@ public class TeamModel implements Serializable, Comparable<TeamModel> {
 

 	// field names are reflectively mapped in EditTeam page

 	public String name;

+	public boolean canAdmin;

+	public boolean canFork;

+	public boolean canCreate;

 	public final Set<String> users = new HashSet<String>();

 	// retained for backwards-compatibility with RPC clients

 	@Deprecated

diff --git a/src/com/gitblit/models/UserModel.java b/src/com/gitblit/models/UserModel.java
index d8c2abe3..6fe8df2b 100644
--- a/src/com/gitblit/models/UserModel.java
+++ b/src/com/gitblit/models/UserModel.java
@@ -26,6 +26,7 @@ import com.gitblit.Constants.AccessPermission;
 import com.gitblit.Constants.AccessRestrictionType;

 import com.gitblit.Constants.AuthorizationControl;

 import com.gitblit.Constants.Unused;

+import com.gitblit.utils.ArrayUtils;

 import com.gitblit.utils.StringUtils;

 

 /**

@@ -80,7 +81,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 	 */

 	@Deprecated

 	public boolean canAccessRepository(String repositoryName) {

-		return canAdmin || repositories.contains(repositoryName.toLowerCase())

+		return canAdmin() || repositories.contains(repositoryName.toLowerCase())

 				|| hasTeamAccess(repositoryName);

 	}

 

@@ -90,7 +91,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 		boolean isOwner = !StringUtils.isEmpty(repository.owner)

 				&& repository.owner.equals(username);

 		boolean allowAuthenticated = isAuthenticated && AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl);

-		return canAdmin || isOwner || repositories.contains(repository.name.toLowerCase())

+		return canAdmin() || isOwner || repositories.contains(repository.name.toLowerCase())

 				|| hasTeamAccess(repository.name) || allowAuthenticated;

 	}

 

@@ -177,7 +178,7 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 	}

 

 	public AccessPermission getRepositoryPermission(RepositoryModel repository) {

-		if (canAdmin || repository.isOwner(username) || repository.isUsersPersonalRepository(username)) {

+		if (canAdmin() || repository.isOwner(username) || repository.isUsersPersonalRepository(username)) {

 			return AccessPermission.REWIND;

 		}

 		if (AuthorizationControl.AUTHENTICATED.equals(repository.authorizationControl) && isAuthenticated) {

@@ -265,24 +266,84 @@ public class UserModel implements Principal, Serializable, Comparable<UserModel>
 			// can not fork your own repository

 			return false;

 		}

-		if (canAdmin || repository.isOwner(username)) {

+		if (canAdmin() || repository.isOwner(username)) {

 			return true;

 		}

 		if (!repository.allowForks) {

 			return false;

 		}

-		if (!isAuthenticated || !canFork) {

+		if (!isAuthenticated || !canFork()) {

 			return false;

 		}

 		return canClone(repository);

 	}

 	

 	public boolean canDelete(RepositoryModel model) {

-		return canAdmin || model.isUsersPersonalRepository(username);

+		return canAdmin() || model.isUsersPersonalRepository(username);

 	}

 	

 	public boolean canEdit(RepositoryModel model) {

-		return canAdmin || model.isUsersPersonalRepository(username) || model.isOwner(username);

+		return canAdmin() || model.isUsersPersonalRepository(username) || model.isOwner(username);

+	}

+	

+	/**

+	 * This returns true if the user has fork privileges or the user has fork

+	 * privileges because of a team membership.

+	 * 

+	 * @return true if the user can fork

+	 */

+	public boolean canFork() {

+		if (canFork) {

+			return true;

+		}

+		if (!ArrayUtils.isEmpty(teams)) {

+			for (TeamModel team : teams) {

+				if (team.canFork) {

+					return true;

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * This returns true if the user has admin privileges or the user has admin

+	 * privileges because of a team membership.

+	 * 

+	 * @return true if the user can admin

+	 */

+	public boolean canAdmin() {

+		if (canAdmin) {

+			return true;

+		}

+		if (!ArrayUtils.isEmpty(teams)) {

+			for (TeamModel team : teams) {

+				if (team.canAdmin) {

+					return true;

+				}

+			}

+		}

+		return false;

+	}

+

+	/**

+	 * This returns true if the user has create privileges or the user has create

+	 * privileges because of a team membership.

+	 * 

+	 * @return true if the user can admin

+	 */

+	public boolean canCreate() {

+		if (canCreate) {

+			return true;

+		}

+		if (!ArrayUtils.isEmpty(teams)) {

+			for (TeamModel team : teams) {

+				if (team.canCreate) {

+					return true;

+				}

+			}

+		}

+		return false;

 	}

 

 	public boolean isTeamMember(String teamname) {

diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index 16a4ec80..21bd1b70 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -60,7 +60,7 @@ public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy imp
 					if (authenticateAdmin) {

 						// authenticate admin

 						if (user != null) {

-							return user.canAdmin;

+							return user.canAdmin();

 						}

 						return false;

 					} else {

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 97faf761..0c500648 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -329,7 +329,7 @@ gb.allowForks = allow forks
 gb.allowForksDescription = allow authorized users to fork this repository

 gb.forkedFrom = forked from

 gb.canFork = can fork

-gb.canForkDescription = user is permitted to fork authorized repositories

+gb.canForkDescription = can fork authorized repositories to a personal repository

 gb.myFork = view my fork

 gb.forksProhibited = forks prohibited

 gb.forksProhibitedWarning = this repository forbids forks

diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index 0e1ae512..015d97ad 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -103,7 +103,7 @@ public final class GitBlitWebSession extends WebSession {
 		if (user == null) {

 			return false;

 		}

-		return user.canAdmin;

+		return user.canAdmin();

 	}

 	

 	public String getUsername() {

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index f7427eb5..8176c28b 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -83,7 +83,7 @@ public class EditRepositoryPage extends RootSubPage {
 		

 		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 @@ public class EditRepositoryPage extends RootSubPage {
 		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 @@ public class EditRepositoryPage extends RootSubPage {
 						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 @@ public class EditRepositoryPage extends RootSubPage {
 				}

 				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;

diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.html b/src/com/gitblit/wicket/pages/EditTeamPage.html
index 5a2edaee..30d2a94c 100644
--- a/src/com/gitblit/wicket/pages/EditTeamPage.html
+++ b/src/com/gitblit/wicket/pages/EditTeamPage.html
@@ -12,7 +12,10 @@
 			<tbody class="settings">

 				<tr><td colspan="2"><h3><wicket:message key="gb.general"></wicket:message> &nbsp;<small><wicket:message key="gb.generalDescription"></wicket:message></small></h3></td></tr>

 				<tr><th><wicket:message key="gb.teamName"></wicket:message></th><td class="edit"><input type="text" wicket:id="name" id="name" size="30" tabindex="1" /></td></tr>

-				<tr><th><wicket:message key="gb.mailingLists"></wicket:message></th><td class="edit"><input class="span8" type="text" wicket:id="mailingLists" size="40" tabindex="2" /></td></tr>

+				<tr><th><wicket:message key="gb.canAdmin"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canAdmin" tabindex="2" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canAdminDescription"></wicket:message></span></label></td></tr>				

+				<tr><th><wicket:message key="gb.canCreate"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canCreate" tabindex="3" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canCreateDescription"></wicket:message></span></label></td></tr>				

+				<tr><th><wicket:message key="gb.canFork"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canFork" tabindex="4" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canForkDescription"></wicket:message></span></label></td></tr>				

+				<tr><th><wicket:message key="gb.mailingLists"></wicket:message></th><td class="edit"><input class="span8" type="text" wicket:id="mailingLists" size="40" tabindex="5" /></td></tr>

 				<tr><td colspan="2" style="padding-top:15px;"><h3><wicket:message key="gb.accessPermissions"></wicket:message> &nbsp;<small><wicket:message key="gb.accessPermissionsForTeamDescription"></wicket:message></small></h3></td></tr>	

 				<tr><th style="vertical-align: top;"><wicket:message key="gb.teamMembers"></wicket:message></th><td style="padding:2px;"><span wicket:id="users"></span></td></tr>

 				<tr><td colspan="2"><hr></hr></td></tr>

@@ -20,7 +23,7 @@
 				<tr><td colspan="2" style="padding-top:10px;"><h3><wicket:message key="gb.hookScripts"></wicket:message> &nbsp;<small><wicket:message key="gb.hookScriptsDescription"></wicket:message></small></h3></td></tr>	

 				<tr><th style="vertical-align: top;"><wicket:message key="gb.preReceiveScripts"></wicket:message><p></p><span wicket:id="inheritedPreReceive"></span></th><td style="padding:2px;"><span wicket:id="preReceiveScripts"></span></td></tr>

 				<tr><th style="vertical-align: top;"><wicket:message key="gb.postReceiveScripts"></wicket:message><p></p><span wicket:id="inheritedPostReceive"></span></th><td style="padding:2px;"><span wicket:id="postReceiveScripts"></span></td></tr>

-				<tr><td colspan='2'><div class="form-actions"><input class="btn btn-primary" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="3" /> &nbsp; <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="4" /></div></td></tr>

+				<tr><td colspan='2'><div class="form-actions"><input class="btn btn-primary" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="6" /> &nbsp; <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="7" /></div></td></tr>

 			</tbody>

 		</table>

 	</form>	

diff --git a/src/com/gitblit/wicket/pages/EditTeamPage.java b/src/com/gitblit/wicket/pages/EditTeamPage.java
index 96bd188f..9cbccb59 100644
--- a/src/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/com/gitblit/wicket/pages/EditTeamPage.java
@@ -27,6 +27,7 @@ import org.apache.wicket.PageParameters;
 import org.apache.wicket.behavior.SimpleAttributeModifier;

 import org.apache.wicket.extensions.markup.html.form.palette.Palette;

 import org.apache.wicket.markup.html.form.Button;

+import org.apache.wicket.markup.html.form.CheckBox;

 import org.apache.wicket.markup.html.form.Form;

 import org.apache.wicket.markup.html.form.TextField;

 import org.apache.wicket.model.CompoundPropertyModel;

@@ -222,6 +223,9 @@ public class EditTeamPage extends RootSubPage {
 		

 		// field names reflective match TeamModel fields

 		form.add(new TextField<String>("name"));

+		form.add(new CheckBox("canAdmin"));

+		form.add(new CheckBox("canFork"));

+		form.add(new CheckBox("canCreate"));

 		form.add(users.setEnabled(editMemberships));

 		mailingLists = new Model<String>(teamModel.mailingLists == null ? ""

 				: StringUtils.flattenStrings(teamModel.mailingLists, " "));

diff --git a/src/com/gitblit/wicket/pages/EditUserPage.html b/src/com/gitblit/wicket/pages/EditUserPage.html
index 77932079..9f178df8 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.html
+++ b/src/com/gitblit/wicket/pages/EditUserPage.html
@@ -17,8 +17,8 @@
 				<tr><th><wicket:message key="gb.displayName"></wicket:message></th><td class="edit"><input type="text" wicket:id="displayName" size="30" tabindex="4" /></td></tr>

 				<tr><th><wicket:message key="gb.emailAddress"></wicket:message></th><td class="edit"><input type="text" wicket:id="emailAddress" size="30" tabindex="5" /></td></tr>

 				<tr><th><wicket:message key="gb.canAdmin"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canAdmin" tabindex="6" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canAdminDescription"></wicket:message></span></label></td></tr>				

-				<tr><th><wicket:message key="gb.canFork"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canFork" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canForkDescription"></wicket:message></span></label></td></tr>				

-				<tr><th><wicket:message key="gb.canCreate"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canCreate" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canCreateDescription"></wicket:message></span></label></td></tr>				

+				<tr><th><wicket:message key="gb.canCreate"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canCreate" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canCreateDescription"></wicket:message></span></label></td></tr>				

+				<tr><th><wicket:message key="gb.canFork"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="canFork" tabindex="8" /> &nbsp;<span class="help-inline"><wicket:message key="gb.canForkDescription"></wicket:message></span></label></td></tr>				

 				<tr><th><wicket:message key="gb.excludeFromFederation"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="excludeFromFederation" tabindex="9" /> &nbsp;<span class="help-inline"><wicket:message key="gb.excludeFromFederationDescription"></wicket:message></span></label></td></tr>				

 				<tr><td colspan="2" style="padding-top:15px;"><h3><wicket:message key="gb.accessPermissions"></wicket:message> &nbsp;<small><wicket:message key="gb.accessPermissionsForUserDescription"></wicket:message></small></h3></td></tr>	

 				<tr><th style="vertical-align: top;"><wicket:message key="gb.teamMemberships"></wicket:message></th><td style="padding:2px;"><span wicket:id="teams"></span></td></tr>

diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index 9048eba3..b7cade6f 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -248,7 +248,7 @@ public abstract class RepositoryPage extends BasePage {
 				// user not allowed to fork or fork already exists or repo forbids forking

 				add(new ExternalLink("forkLink", "").setVisible(false));

 				

-				if (user.canFork && !model.allowForks) {

+				if (user.canFork() && !model.allowForks) {

 					// show forks prohibited indicator

 					Fragment wc = new Fragment("forksProhibitedIndicator", "forksProhibitedFragment", this);

 					Label lbl = new Label("forksProhibited", getString("gb.forksProhibited"));

diff --git a/src/com/gitblit/wicket/pages/UserPage.java b/src/com/gitblit/wicket/pages/UserPage.java
index e699d03f..d3e93c61 100644
--- a/src/com/gitblit/wicket/pages/UserPage.java
+++ b/src/com/gitblit/wicket/pages/UserPage.java
@@ -101,7 +101,7 @@ public class UserPage extends RootPage {
 		add(new GravatarImage("gravatar", person, 210));

 		

 		UserModel sessionUser = GitBlitWebSession.get().getUser();

-		if (sessionUser != null && user.canCreate && sessionUser.equals(user)) {

+		if (sessionUser != null && user.canCreate() && sessionUser.equals(user)) {

 			// user can create personal repositories

 			add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

 		} else {

diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
index 137fae6b..5678b092 100644
--- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java
+++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java
@@ -92,7 +92,7 @@ public class RepositoriesPanel extends BasePanel {
 			}.setVisible(GitBlit.getBoolean(Keys.git.cacheRepositoryList, true)));

 			managementLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

 			add(managementLinks);

-		} else if (showManagement && user != null && user.canCreate) {

+		} else if (showManagement && user != null && user.canCreate()) {

 			// user can create personal repositories

 			managementLinks = new Fragment("managementPanel", "personalLinks", this);

 			managementLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

diff --git a/src/com/gitblit/wicket/panels/UsersPanel.java b/src/com/gitblit/wicket/panels/UsersPanel.java
index 6672c407..c5dba847 100644
--- a/src/com/gitblit/wicket/panels/UsersPanel.java
+++ b/src/com/gitblit/wicket/panels/UsersPanel.java
@@ -81,7 +81,7 @@ public class UsersPanel extends BasePanel {
 					item.add(editLink);

 				}

 

-				item.add(new Label("accesslevel", entry.canAdmin ? "administrator" : ""));

+				item.add(new Label("accesslevel", entry.canAdmin() ? "administrator" : ""));

 				item.add(new Label("teams", entry.teams.size() > 0 ? ("" + entry.teams.size()) : ""));

 				item.add(new Label("repositories",

 						entry.repositories.size() > 0 ? ("" + entry.repositories.size()) : ""));