Added short commit id column to log and history tables (issue 168)

James Moger

2012-11-27 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5

 src/com/gitblit/wicket/pages/EditUserPage.java

@@ -34,23 +34,24 @@
import org.apache.wicket.model.util.CollectionModel;

import org.apache.wicket.model.util.ListModel;



import com.gitblit.Constants.AccessRestrictionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.RequiresAdminRole;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;



@RequiresAdminRole

public class EditUserPage extends RootSubPage {



   private final boolean isCreate;



	
   public EditUserPage() {

      // create constructor

      super();

@@ -60,6 +61,8 @@
      }

      isCreate = true;

      setupPage(new UserModel(""));

      setStatelessHint(false);

      setOutputMarkupId(true);

   }



   public EditUserPage(PageParameters params) {

@@ -69,6 +72,13 @@
      String name = WicketUtils.getUsername(params);

      UserModel model = GitBlit.self().getUserModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

   }

	
   @Override

   protected boolean requiresPageMap() {

      return true;

   }



   protected void setupPage(final UserModel userModel) {

@@ -82,13 +92,9 @@
            StringUtils.isEmpty(userModel.password) ? "" : userModel.password);

      CompoundPropertyModel<UserModel> model = new CompoundPropertyModel<UserModel>(userModel);



      List<String> repos = new ArrayList<String>();

      for (String repo : GitBlit.self().getRepositoryList()) {

         RepositoryModel repositoryModel = GitBlit.self().getRepositoryModel(repo);

         if (repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE)) {

            repos.add(repo);

         }

      }

      // build list of projects including all repositories wildcards

      List<String> repos = getAccessRestrictedRepositoryList(true, userModel);

		
      List<String> userTeams = new ArrayList<String>();

      for (TeamModel team : userModel.teams) {

         userTeams.add(team.name);

@@ -96,16 +102,15 @@
      Collections.sort(userTeams);

      

      final String oldName = userModel.username;

      final Palette<String> repositories = new Palette<String>("repositories",

            new ListModel<String>(new ArrayList<String>(userModel.repositories)),

            new CollectionModel<String>(repos), new StringChoiceRenderer(), 10, false);

      final List<RegistrantAccessPermission> permissions = GitBlit.self().getUserAccessPermissions(userModel);



      final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(

            new ArrayList<String>(userTeams)), new CollectionModel<String>(GitBlit.self()

            .getAllTeamnames()), new StringChoiceRenderer(), 10, false);

      Form<UserModel> form = new Form<UserModel>("editForm", model) {



         private static final long serialVersionUID = 1L;



			
         /*

          * (non-Javadoc)

          * 

@@ -167,13 +172,10 @@
               }

            }



            Iterator<String> selectedRepositories = repositories.getSelectedChoices();

            List<String> repos = new ArrayList<String>();

            while (selectedRepositories.hasNext()) {

               repos.add(selectedRepositories.next().toLowerCase());

            // update user permissions

            for (RegistrantAccessPermission repositoryPermission : permissions) {

               userModel.setRepositoryPermission(repositoryPermission.registrant, repositoryPermission.permission);

            }

            userModel.repositories.clear();

            userModel.repositories.addAll(repos);



            Iterator<String> selectedTeams = teams.getSelectedChoices();

            userModel.teams.clear();

@@ -234,7 +236,7 @@
      form.add(new CheckBox("canFork"));

      form.add(new CheckBox("canCreate"));

      form.add(new CheckBox("excludeFromFederation"));

      form.add(repositories);

      form.add(new RegistrantPermissionsPanel("repositories",   RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));

      form.add(teams.setEnabled(editTeams));



      form.add(new Button("save"));