updating current development

Merge remote-tracking branch 'upstream/master' into translation_to_pt-br

1 files changed, 13 insertions, 6 deletions

diff --git a/src/com/gitblit/client/UsersTableModel.java b/src/com/gitblit/client/UsersTableModel.java
index b8ce45d4..439d5afb 100644
--- a/src/com/gitblit/client/UsersTableModel.java
+++ b/src/com/gitblit/client/UsersTableModel.java
@@ -36,7 +36,7 @@ public class UsersTableModel extends AbstractTableModel {
 	List<UserModel> list;

 

 	enum Columns {

-		Name, Display_Name, AccessLevel, Teams, Repositories;

+		Name, Display_Name, Type, Teams, Repositories;

 

 		@Override

 		public String toString() {

@@ -71,8 +71,8 @@ public class UsersTableModel extends AbstractTableModel {
 			return Translation.get("gb.name");

 		case Display_Name:

 			return Translation.get("gb.displayName");

-		case AccessLevel:

-			return Translation.get("gb.accessLevel");

+		case Type:

+			return Translation.get("gb.type");

 		case Teams:

 			return Translation.get("gb.teamMemberships");

 		case Repositories:

@@ -101,11 +101,18 @@ public class UsersTableModel extends AbstractTableModel {
 			return model.username;

 		case Display_Name:

 			return model.displayName;

-		case AccessLevel:

+		case Type:

+			StringBuilder sb = new StringBuilder();

+			if (model.accountType != null) {

+				sb.append(model.accountType.name());

+			}

 			if (model.canAdmin()) {

-				return "administrator";

+				if (sb.length() > 0) {

+					sb.append(", ");

+				}

+				sb.append("admin");

 			}

-			return "";

+			return sb.toString();

 		case Teams:

 			return (model.teams == null || model.teams.size() == 0) ? "" : String

 					.valueOf(model.teams.size());