From 7e0ce40e79a193426e8f7b6f22407422634dafe3 Mon Sep 17 00:00:00 2001
From: John Crygier <john.crygier@aon.com>
Date: Wed, 25 Apr 2012 08:37:52 -0400
Subject: [PATCH] Add logic to get display name & email (Simply stored in user model for now). Add code / test to defend against LDAP injection attacks.
---
src/com/gitblit/client/UsersTableModel.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index de282b8..fa86a13 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, AccessLevel, Teams, Repositories;
@Override
public String toString() {
@@ -71,6 +71,10 @@
return Translation.get("gb.name");
case AccessLevel:
return Translation.get("gb.accessLevel");
+ case Teams:
+ return Translation.get("gb.teamMemberships");
+ case Repositories:
+ return Translation.get("gb.repositories");
}
return "";
}
@@ -97,6 +101,13 @@
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.repositories == null || model.repositories.size() == 0) ? "" : String
+ .valueOf(model.repositories.size());
}
return null;
}
--
Gitblit v1.9.1