From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/client/UsersTableModel.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index 57536ad..439d5af 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;
+ Name, Display_Name, Type, Teams, Repositories;
@Override
public String toString() {
@@ -69,6 +69,14 @@
switch (col) {
case Name:
return Translation.get("gb.name");
+ case Display_Name:
+ return Translation.get("gb.displayName");
+ case Type:
+ return Translation.get("gb.type");
+ case Teams:
+ return Translation.get("gb.teamMemberships");
+ case Repositories:
+ return Translation.get("gb.repositories");
}
return "";
}
@@ -91,6 +99,26 @@
switch (col) {
case Name:
return model.username;
+ case Display_Name:
+ return model.displayName;
+ case Type:
+ StringBuilder sb = new StringBuilder();
+ if (model.accountType != null) {
+ sb.append(model.accountType.name());
+ }
+ if (model.canAdmin()) {
+ if (sb.length() > 0) {
+ sb.append(", ");
+ }
+ sb.append("admin");
+ }
+ return sb.toString();
+ case Teams:
+ return (model.teams == null || model.teams.size() == 0) ? "" : String
+ .valueOf(model.teams.size());
+ case Repositories:
+ return (model.permissions == null || model.permissions.size() == 0) ? "" : String
+ .valueOf(model.permissions.size());
}
return null;
}
--
Gitblit v1.9.1