From eba89539a29deba954035056437279088c3e047b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 22 Oct 2012 16:52:48 -0400
Subject: [PATCH] Tweak permissions panel layout a bit
---
src/com/gitblit/client/UsersTableModel.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index fa86a13..b8ce45d 100644
--- a/src/com/gitblit/client/UsersTableModel.java
+++ b/src/com/gitblit/client/UsersTableModel.java
@@ -36,7 +36,7 @@
List<UserModel> list;
enum Columns {
- Name, AccessLevel, Teams, Repositories;
+ Name, Display_Name, AccessLevel, Teams, Repositories;
@Override
public String toString() {
@@ -69,6 +69,8 @@
switch (col) {
case Name:
return Translation.get("gb.name");
+ case Display_Name:
+ return Translation.get("gb.displayName");
case AccessLevel:
return Translation.get("gb.accessLevel");
case Teams:
@@ -97,8 +99,10 @@
switch (col) {
case Name:
return model.username;
+ case Display_Name:
+ return model.displayName;
case AccessLevel:
- if (model.canAdmin) {
+ if (model.canAdmin()) {
return "administrator";
}
return "";
@@ -106,8 +110,8 @@
return (model.teams == null || model.teams.size() == 0) ? "" : String
.valueOf(model.teams.size());
case Repositories:
- return (model.repositories == null || model.repositories.size() == 0) ? "" : String
- .valueOf(model.repositories.size());
+ return (model.permissions == null || model.permissions.size() == 0) ? "" : String
+ .valueOf(model.permissions.size());
}
return null;
}
--
Gitblit v1.9.1