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

James Moger

2012-11-27 73f1adb2e84b8b9cd4045bcdd7d9afa72d3875b5

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

@@ -146,11 +146,11 @@
         }

      } else {

         super.setupPage(getString("gb.edit"), repositoryModel.name);

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

            repositoryUsers.addAll(GitBlit.self().getUserAccessPermissions(repositoryModel));

            repositoryTeams.addAll(GitBlit.self().getTeamAccessPermissions(repositoryModel));

            Collections.sort(repositoryUsers);

         }

         repositoryUsers.addAll(GitBlit.self().getUserAccessPermissions(repositoryModel));

         repositoryTeams.addAll(GitBlit.self().getTeamAccessPermissions(repositoryModel));

         Collections.sort(repositoryUsers);

         Collections.sort(repositoryTeams);

			
         federationSets.addAll(repositoryModel.federationSets);

         if (!ArrayUtils.isEmpty(repositoryModel.indexedBranches)) {

            indexedBranches.addAll(repositoryModel.indexedBranches);

@@ -378,7 +378,7 @@
      form.add(new TextField<String>("name").setEnabled(allowEditName));

      form.add(new TextField<String>("description"));

      form.add(new DropDownChoice<String>("owner", GitBlit.self().getAllUsernames())

            .setEnabled(GitBlitWebSession.get().canAdmin()));

            .setEnabled(GitBlitWebSession.get().canAdmin() && !repositoryModel.isPersonalRepository()));

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

      DropDownChoice<AccessRestrictionType> accessRestriction = new DropDownChoice<AccessRestrictionType>("accessRestriction", Arrays

            .asList(AccessRestrictionType.values()), new AccessRestrictionRenderer());

@@ -423,8 +423,10 @@
      final RadioChoice<AuthorizationControl> authorizationControl = new RadioChoice<Constants.AuthorizationControl>(

            "authorizationControl", acList, new AuthorizationControlRenderer());

      form.add(authorizationControl);

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

		
      final CheckBox verifyCommitter = new CheckBox("verifyCommitter");

      verifyCommitter.setOutputMarkupId(true);

      form.add(verifyCommitter);



      form.add(usersPalette);

      form.add(teamsPalette);

@@ -446,14 +448,16 @@
         usersPalette.setEnabled(false);

         teamsPalette.setEnabled(false);

         authorizationControl.setEnabled(false);

         verifyCommitter.setEnabled(false);

      } else {

         // authenticated something

         // enable authorization controls

         authorizationControl.setEnabled(true);

         verifyCommitter.setEnabled(true);

         

         boolean allowFineGrainedControls = repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);

         usersPalette.setEnabled(allowFineGrainedControls);

         teamsPalette.setEnabled(allowFineGrainedControls);			
         teamsPalette.setEnabled(allowFineGrainedControls);

      }

      

      accessRestriction.add(new AjaxFormComponentUpdatingBehavior("onchange") {

@@ -464,6 +468,7 @@
            // enable/disable permissions panel based on access restriction

            boolean allowAuthorizationControl = repositoryModel.accessRestriction.exceeds(AccessRestrictionType.NONE);

            authorizationControl.setEnabled(allowAuthorizationControl);

            verifyCommitter.setEnabled(allowAuthorizationControl);

            

            boolean allowFineGrainedControls = allowAuthorizationControl && repositoryModel.authorizationControl.equals(AuthorizationControl.NAMED);

            usersPalette.setEnabled(allowFineGrainedControls);

@@ -474,6 +479,7 @@
            }

            

            target.addComponent(authorizationControl);

            target.addComponent(verifyCommitter);

            target.addComponent(usersPalette);

            target.addComponent(teamsPalette);

         }