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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index fa86a13..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, 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 "";
--
Gitblit v1.9.1