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,11 +34,10 @@
import org.apache.wicket.model.util.CollectionModel;

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



import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.Constants.PermissionType;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.TeamModel;

import com.gitblit.models.UserModel;

@@ -76,6 +75,11 @@
      setStatelessHint(false);

      setOutputMarkupId(true);

   }

	
   @Override

   protected boolean requiresPageMap() {

      return true;

   }



   protected void setupPage(final UserModel userModel) {

      if (isCreate) {

@@ -98,19 +102,7 @@
      Collections.sort(userTeams);

      

      final String oldName = userModel.username;

      final List<RegistrantAccessPermission> permissions = userModel.getRepositoryPermissions();

      for (RegistrantAccessPermission permission : permissions) {

         if (permission.isEditable && PermissionType.EXPLICIT.equals(permission.permissionType)) {

            // Ensure this is NOT an owner permission - which is non-editable

            // We don't know this from within the usermodel, ownership is a

            // property of a repository.

            boolean isOwner = GitBlit.self().getRepositoryModel(permission.registrant).isOwner(oldName);

            if (isOwner) {

               permission.permissionType = PermissionType.OWNER;

               permission.isEditable = 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()