From 856c8a2ad521064d69b2b50003c1df382d375013 Mon Sep 17 00:00:00 2001
From: Marcin Floryan <marcin.floryan@gmail.com>
Date: Sat, 03 Nov 2012 15:15:22 -0400
Subject: [PATCH] Download progress - CR character behaves as expected on Windows but not on other platforms.
---
src/com/gitblit/client/UsersTableModel.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index de282b8..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;
+ Name, Display_Name, AccessLevel, Teams, Repositories;
@Override
public String toString() {
@@ -69,8 +69,14 @@
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:
+ return Translation.get("gb.teamMemberships");
+ case Repositories:
+ return Translation.get("gb.repositories");
}
return "";
}
@@ -93,10 +99,19 @@
switch (col) {
case Name:
return model.username;
+ case Display_Name:
+ return model.displayName;
case AccessLevel:
- if (model.canAdmin) {
+ if (model.canAdmin()) {
return "administrator";
}
+ return "";
+ 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