Exclude submodules from zip downloads (issue 151)

James Moger

2012-10-18 13417cf9c6eec555b51da49742e47939d2f5715b

 src/com/gitblit/wicket/panels/UsersPanel.java

@@ -28,6 +28,7 @@


import com.gitblit.GitBlit;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.EditUserPage;



@@ -39,7 +40,8 @@
      super(wicketId);



      Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);

      adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class));

      adminLinks.add(new BookmarkablePageLink<Void>("newUser", EditUserPage.class)

            .setVisible(GitBlit.self().supportsCredentialChanges()));

      add(adminLinks.setVisible(showAdmin));



      final List<UserModel> users = GitBlit.self().getAllUsers();

@@ -58,9 +60,28 @@
            final UserModel entry = item.getModelObject();

            LinkPanel editLink = new LinkPanel("username", "list", entry.username,

                  EditUserPage.class, WicketUtils.newUsernameParameter(entry.username));

            WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.username);

            WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());

            item.add(editLink);

            item.add(new Label("accesslevel", entry.canAdmin ? "administrator" : ""));

				
            if (StringUtils.isEmpty(entry.displayName)) {

               item.add(new Label("displayName").setVisible(false));

            } else {

               editLink = new LinkPanel("displayName", "list", entry.getDisplayName(),

                  EditUserPage.class, WicketUtils.newUsernameParameter(entry.username));

               WicketUtils.setHtmlTooltip(editLink, getString("gb.edit") + " " + entry.getDisplayName());

               item.add(editLink);

            }



            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("accesslevel", entry.canAdmin() ? "administrator" : ""));

            item.add(new Label("teams", entry.teams.size() > 0 ? ("" + entry.teams.size()) : ""));

            item.add(new Label("repositories",

                  entry.repositories.size() > 0 ? ("" + entry.repositories.size()) : ""));

@@ -75,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);