From 55caee469f3ac4b14ddafe7f1183e877e5b7da61 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:05 -0400
Subject: [PATCH] Revise user list columns to match web ui
---
src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
index 52aedbb..732eba2 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
@@ -386,10 +386,10 @@
protected void asTable(List<UserModel> list) {
String[] headers;
if (verbose) {
- String[] h = { "Name", "Display name", "Type", "Email", "Create?", "Fork?"};
+ String[] h = { "Name", "Display name", "Email", "Type", "Teams", "Create?", "Fork?"};
headers = h;
} else {
- String[] h = { "Name", "Display name", "Type", "Email"};
+ String[] h = { "Name", "Display name", "Email", "Type"};
headers = h;
}
@@ -399,13 +399,20 @@
String name = (u.disabled ? "-" : ((u.canAdmin() ? "*" : " "))) + u.username;
if (verbose) {
- data[i] = new Object[] { name, u.displayName, u.accountType,
+ data[i] = new Object[] {
+ name,
+ u.displayName,
u.emailAddress,
+ u.accountType + (u.canAdmin() ? ",admin":""),
+ u.teams.isEmpty() ? "" : u.teams.size(),
(u.canAdmin() || u.canCreate()) ? "Y":"",
(u.canAdmin() || u.canFork()) ? "Y" : ""};
} else {
- data[i] = new Object[] { name, u.displayName, u.accountType,
- u.emailAddress };
+ data[i] = new Object[] {
+ name,
+ u.displayName,
+ u.emailAddress,
+ u.accountType + (u.canAdmin() ? ",admin":"")};
}
}
stdout.print(FlipTable.of(headers, data, Borders.BODY_HCOLS));
@@ -417,10 +424,12 @@
protected void asTabbed(List<UserModel> users) {
if (verbose) {
for (UserModel u : users) {
- outTabbed(u.disabled ? "-" : ((u.canAdmin() ? "*" : " ")) + u.username,
+ outTabbed(
+ u.disabled ? "-" : ((u.canAdmin() ? "*" : " ")) + u.username,
u.getDisplayName(),
- u.accountType,
u.emailAddress == null ? "" : u.emailAddress,
+ u.accountType + (u.canAdmin() ? ",admin":""),
+ u.teams.isEmpty() ? "" : u.teams.size(),
(u.canAdmin() || u.canCreate()) ? "Y":"",
(u.canAdmin() || u.canFork()) ? "Y" : "");
}
--
Gitblit v1.9.1