From 13417cf9c6eec555b51da49742e47939d2f5715b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 19 Oct 2012 22:47:33 -0400
Subject: [PATCH] Exclude submodules from zip downloads (issue 151)
---
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..f635f7e 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.repositories == null || model.repositories.size() == 0) ? "" : String
+ .valueOf(model.repositories.size());
}
return null;
}
--
Gitblit v1.9.1