James Moger
2013-01-05 9e186eedf1a09ca7ac4fbdea32b00e7e5331f7eb
src/com/gitblit/wicket/panels/UsersPanel.java
@@ -41,7 +41,7 @@
      Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);
      adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class)
            .setVisible(GitBlit.self().supportsCredentialChanges()));
            .setVisible(GitBlit.self().supportsAddUser()));
      add(adminLinks.setVisible(showAdmin));
      final List<UserModel> users = GitBlit.self().getAllUsers();
@@ -71,11 +71,20 @@
               WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
               item.add(editLink);
            }
            item.add(new Label("accesslevel", entry.canAdmin ? "administrator" : ""));
            if (StringUtils.isEmpty(entry.emailAddress)) {
               item.add(new Label("emailAddress").setVisible(false));
            } else {
               editLink = new LinkPanel("emailAddress", "list", entry.emailAddress,
                  EditUserPage.class, WicketUtils.newUsernameParameter(entry.username));
               WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());
               item.add(editLink);
            }
            item.add(new Label("accountType", entry.accountType.name() + (entry.canAdmin() ? ", admin":"")));
            item.add(new Label("teams", entry.teams.size() > 0 ? ("" + entry.teams.size()) : ""));
            item.add(new Label("repositories",
                  entry.repositories.size() > 0 ? ("" + entry.repositories.size()) : ""));
                  entry.permissions.size() > 0 ? ("" + entry.permissions.size()) : ""));
            Fragment userLinks = new Fragment("userLinks", "userAdminLinks", this);
            userLinks.add(new BookmarkablePageLink<Void>("editUser", EditUserPage.class,
                  WicketUtils.newUsernameParameter(entry.username)));
@@ -87,15 +96,15 @@
               public void onClick() {
                  if (GitBlit.self().deleteUser(entry.username)) {
                     users.remove(entry);
                     info(MessageFormat.format("User ''{0}'' deleted.", entry.username));
                     info(MessageFormat.format(getString("gb.userDeleted"), entry.username));
                  } else {
                     error(MessageFormat.format("Failed to delete user ''{0}''!",
                     error(MessageFormat.format(getString("gb.deleteUserFailed"),
                           entry.username));
                  }
               }
            };
            deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(
                  "Delete user \"{0}\"?", entry.username)));
                  getString("gb.deleteUser"), entry.username)));
            userLinks.add(deleteLink);
            item.add(userLinks);