Use AccessPolicyPanel in EditRepositoryPage

James Moger

2014-05-31 6a437ec4a6853bdd15f7c33f7fbafdd247a3790c

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

@@ -29,18 +29,18 @@
import org.apache.wicket.PageParameters;

import org.apache.wicket.ajax.AjaxRequestTarget;

import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;

import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.extensions.markup.html.form.palette.Palette;

import org.apache.wicket.markup.html.WebMarkupContainer;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.CheckBox;

import org.apache.wicket.markup.html.form.ChoiceRenderer;

import org.apache.wicket.markup.html.form.DropDownChoice;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.IChoiceRenderer;

import org.apache.wicket.markup.html.form.RadioChoice;

import org.apache.wicket.markup.html.form.TextField;

import org.apache.wicket.markup.html.link.Link;

import org.apache.wicket.markup.html.list.ListItem;

import org.apache.wicket.markup.html.list.ListView;

import org.apache.wicket.model.CompoundPropertyModel;

@@ -48,6 +48,7 @@
import org.apache.wicket.model.Model;

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

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

import org.eclipse.jgit.lib.Repository;



import com.gitblit.Constants;

import com.gitblit.Constants.AccessRestrictionType;

@@ -55,23 +56,30 @@
import com.gitblit.Constants.CommitMessageRenderer;

import com.gitblit.Constants.FederationStrategy;

import com.gitblit.Constants.RegistrantType;

import com.gitblit.GitBlit;

import com.gitblit.GitBlitException;

import com.gitblit.Keys;

import com.gitblit.models.RegistrantAccessPermission;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserChoice;

import com.gitblit.models.UserModel;

import com.gitblit.utils.ArrayUtils;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.StringChoiceRenderer;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.AccessPolicyPanel;

import com.gitblit.wicket.panels.BasePanel.JavascriptEventConfirmation;

import com.gitblit.wicket.panels.BulletListPanel;

import com.gitblit.wicket.panels.RegistrantPermissionsPanel;

import com.gitblit.wicket.panels.RepositoryNamePanel;



public class EditRepositoryPage extends RootSubPage {



   private final boolean isCreate;



   RepositoryNamePanel namePanel;



   AccessPolicyPanel accessPolicyPanel;



   private boolean isAdmin;



@@ -86,9 +94,9 @@
      super();

      isCreate = true;

      RepositoryModel model = new RepositoryModel();

      String restriction = GitBlit.getString(Keys.git.defaultAccessRestriction, "PUSH");

      String restriction = app().settings().getString(Keys.git.defaultAccessRestriction, "PUSH");

      model.accessRestriction = AccessRestrictionType.fromName(restriction);

      String authorization = GitBlit.getString(Keys.git.defaultAuthorizationControl, null);

      String authorization = app().settings().getString(Keys.git.defaultAuthorizationControl, null);

      model.authorizationControl = AuthorizationControl.fromName(authorization);



      GitBlitWebSession session = GitBlitWebSession.get();

@@ -113,7 +121,7 @@
      super(params);

      isCreate = false;

      String name = WicketUtils.getRepositoryName(params);

      RepositoryModel model = GitBlit.self().getRepositoryModel(name);

      RepositoryModel model = app().repositories().getRepositoryModel(name);

      setupPage(model);

      setStatelessHint(false);

      setOutputMarkupId(true);

@@ -154,8 +162,8 @@
         }

      } else {

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

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

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

         repositoryUsers.addAll(app().repositories().getUserAccessPermissions(repositoryModel));

         repositoryTeams.addAll(app().repositories().getTeamAccessPermissions(repositoryModel));

         Collections.sort(repositoryUsers);

         Collections.sort(repositoryTeams);



@@ -168,28 +176,44 @@
      final String oldName = repositoryModel.name;



      final RegistrantPermissionsPanel usersPalette = new RegistrantPermissionsPanel("users",

            RegistrantType.USER, GitBlit.self().getAllUsernames(), repositoryUsers, getAccessPermissions());

            RegistrantType.USER, app().users().getAllUsernames(), repositoryUsers, getAccessPermissions());

      final RegistrantPermissionsPanel teamsPalette = new RegistrantPermissionsPanel("teams",

            RegistrantType.TEAM, GitBlit.self().getAllTeamnames(), repositoryTeams, getAccessPermissions());

            RegistrantType.TEAM, app().users().getAllTeamNames(), repositoryTeams, getAccessPermissions());



      // owners palette

      List<String> owners = new ArrayList<String>(repositoryModel.owners);

      List<String> persons = GitBlit.self().getAllUsernames();

      final Palette<String> ownersPalette = new Palette<String>("owners", new ListModel<String>(owners), new CollectionModel<String>(

            persons), new StringChoiceRenderer(), 12, true);

      List<UserChoice> owners = new ArrayList<UserChoice>();

      for (String owner : repositoryModel.owners) {

         UserModel o = app().users().getUserModel(owner);

         if (o != null) {

            owners.add(new UserChoice(o.getDisplayName(), o.username, o.emailAddress));

         } else {

            owners.add(new UserChoice(owner));

         }

      }

      List<UserChoice> persons = new ArrayList<UserChoice>();

      for (String person : app().users().getAllUsernames()) {

         UserModel o = app().users().getUserModel(person);

         if (o != null) {

            persons.add(new UserChoice(o.getDisplayName(), o.username, o.emailAddress));

         } else {

            persons.add(new UserChoice(person));

         }

      }

      final Palette<UserChoice> ownersPalette = new Palette<UserChoice>("owners", new ListModel<UserChoice>(owners), new CollectionModel<UserChoice>(

            persons), new ChoiceRenderer<UserChoice>(null, "userId"), 12, true);



      // indexed local branches palette

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

      allLocalBranches.add(Constants.DEFAULT_BRANCH);

      allLocalBranches.addAll(repositoryModel.getLocalBranches());

      boolean luceneEnabled = GitBlit.getBoolean(Keys.web.allowLuceneIndexing, true);

      boolean luceneEnabled = app().settings().getBoolean(Keys.web.allowLuceneIndexing, true);

      final Palette<String> indexedBranchesPalette = new Palette<String>("indexedBranches", new ListModel<String>(

            indexedBranches), new CollectionModel<String>(allLocalBranches),

            new StringChoiceRenderer(), 8, false);

      indexedBranchesPalette.setEnabled(luceneEnabled);



      // federation sets palette

      List<String> sets = GitBlit.getStrings(Keys.federation.sets);

      List<String> sets = app().settings().getStrings(Keys.federation.sets);

      final Palette<String> federationSetsPalette = new Palette<String>("federationSets",

            new ListModel<String>(federationSets), new CollectionModel<String>(sets),

            new StringChoiceRenderer(), 8, false);

@@ -199,8 +223,8 @@
         preReceiveScripts.addAll(repositoryModel.preReceiveScripts);

      }

      final Palette<String> preReceivePalette = new Palette<String>("preReceiveScripts",

            new ListModel<String>(preReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPreReceiveScriptsUnused(repositoryModel)),

            new ListModel<String>(preReceiveScripts), new CollectionModel<String>(app().repositories()

                  .getPreReceiveScriptsUnused(repositoryModel)),

            new StringChoiceRenderer(), 12, true);



      // post-receive palette

@@ -208,12 +232,12 @@
         postReceiveScripts.addAll(repositoryModel.postReceiveScripts);

      }

      final Palette<String> postReceivePalette = new Palette<String>("postReceiveScripts",

            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(GitBlit

                  .self().getPostReceiveScriptsUnused(repositoryModel)),

            new ListModel<String>(postReceiveScripts), new CollectionModel<String>(app().repositories()

                  .getPostReceiveScriptsUnused(repositoryModel)),

            new StringChoiceRenderer(), 12, true);



      // custom fields

      final Map<String, String> customFieldsMap = GitBlit.getMap(Keys.groovy.customFields);

      final Map<String, String> customFieldsMap = app().settings().getMap(Keys.groovy.customFields);

      List<String> customKeys = new ArrayList<String>(customFieldsMap.keySet());

      final ListView<String> customFieldsListView = new ListView<String>("customFieldsListView", customKeys) {



@@ -243,59 +267,8 @@
         @Override

         protected void onSubmit() {

            try {

               // confirm a repository name was entered

               if (repositoryModel.name == null && StringUtils.isEmpty(repositoryModel.name)) {

                  error(getString("gb.pleaseSetRepositoryName"));

               if (!namePanel.updateModel(repositoryModel)) {

                  return;

               }



               // ensure name is trimmed

               repositoryModel.name = repositoryModel.name.trim();



               // automatically convert backslashes to forward slashes

               repositoryModel.name = repositoryModel.name.replace('\\', '/');

               // Automatically replace // with /

               repositoryModel.name = repositoryModel.name.replace("//", "/");



               // prohibit folder paths

               if (repositoryModel.name.startsWith("/")) {

                  error(getString("gb.illegalLeadingSlash"));

                  return;

               }

               if (repositoryModel.name.startsWith("../")) {

                  error(getString("gb.illegalRelativeSlash"));

                  return;

               }

               if (repositoryModel.name.contains("/../")) {

                  error(getString("gb.illegalRelativeSlash"));

                  return;

               }

               if (repositoryModel.name.endsWith("/")) {

                  repositoryModel.name = repositoryModel.name.substring(0, repositoryModel.name.length() - 1);

               }



               // confirm valid characters in repository name

               Character c = StringUtils.findInvalidCharacter(repositoryModel.name);

               if (c != null) {

                  error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),

                        c));

                  return;

               }



               if (user.canCreate() && !user.canAdmin() && allowEditName) {

                  // ensure repository name begins with the user's path

                  if (!repositoryModel.name.startsWith(user.getPersonalPath())) {

                     error(MessageFormat.format(getString("gb.illegalPersonalRepositoryLocation"),

                           user.getPersonalPath()));

                     return;

                  }



                  if (repositoryModel.name.equals(user.getPersonalPath())) {

                     // reset path prefix and show error

                     repositoryModel.name = user.getPersonalPath() + "/";

                     error(getString("gb.pleaseSetRepositoryName"));

                     return;

                  }

               }



               // confirm access restriction selection

@@ -321,7 +294,9 @@


               // set author metric exclusions

               String ax = metricAuthorExclusions.getObject();

               if (!StringUtils.isEmpty(ax)) {

               if (StringUtils.isEmpty(ax)) {

                  repositoryModel.metricAuthorExclusions = new ArrayList<String>();

               } else {

                  Set<String> list = new HashSet<String>();

                  for (String exclusion : StringUtils.getStringsFromValue(ax,  " ")) {

                     if (StringUtils.isEmpty(exclusion)) {

@@ -338,7 +313,9 @@


               // set mailing lists

               String ml = mailingLists.getObject();

               if (!StringUtils.isEmpty(ml)) {

               if (StringUtils.isEmpty(ml)) {

                  repositoryModel.mailingLists = new ArrayList<String>();

               } else {

                  Set<String> list = new HashSet<String>();

                  for (String address : ml.split("(,|\\s)")) {

                     if (StringUtils.isEmpty(address)) {

@@ -359,9 +336,9 @@


               // owners

               repositoryModel.owners.clear();

               Iterator<String> owners = ownersPalette.getSelectedChoices();

               Iterator<UserChoice> owners = ownersPalette.getSelectedChoices();

               while (owners.hasNext()) {

                  repositoryModel.addOwner(owners.next());

                  repositoryModel.addOwner(owners.next().getUserId());

               }



               // pre-receive scripts

@@ -393,19 +370,20 @@
               }



               // save the repository

               GitBlit.self().updateRepositoryModel(oldName, repositoryModel, isCreate);

               app().gitblit().updateRepositoryModel(oldName, repositoryModel, isCreate);



               // repository access permissions

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

                  GitBlit.self().setUserAccessPermissions(repositoryModel, repositoryUsers);

                  GitBlit.self().setTeamAccessPermissions(repositoryModel, repositoryTeams);

                  app().gitblit().setUserAccessPermissions(repositoryModel, repositoryUsers);

                  app().gitblit().setTeamAccessPermissions(repositoryModel, repositoryTeams);

               }

            } catch (GitBlitException e) {

               error(e.getMessage());

               namePanel.resetModel(repositoryModel);

               return;

            }

            setRedirect(false);

            setResponsePage(RepositoriesPage.class);

            setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));

         }

      };



@@ -413,25 +391,36 @@
      form.add(new SimpleAttributeModifier("autocomplete", "off"));



      // field names reflective match RepositoryModel fields

      form.add(new TextField<String>("name").setEnabled(allowEditName));

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

      namePanel = new RepositoryNamePanel("namePanel", repositoryModel);

      namePanel.setEditable(allowEditName);

      form.add(namePanel);



      form.add(ownersPalette);

      form.add(new CheckBox("allowForks").setEnabled(GitBlit.getBoolean(Keys.web.allowForking, true)));

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

            AccessRestrictionType.choices(GitBlit.getBoolean(Keys.git.allowAnonymousPushes, false)), new AccessRestrictionRenderer());

      form.add(accessRestriction);

      form.add(new CheckBox("allowForks").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));

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

      // TODO enable origin definition

      form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));



      // allow relinking HEAD to a branch or tag other than master on edit repository

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

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

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

         availableRefs.addAll(repositoryModel.availableRefs);

         for (String ref : repositoryModel.availableRefs) {

            if (!ref.startsWith(Constants.R_TICKET)) {

               availableRefs.add(ref);

               if (ref.startsWith(Constants.R_HEADS)) {

                  availableBranches.add(Repository.shortenRefName(ref));

               }

            }

         }

      }

      form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0));



      boolean gcEnabled = GitBlit.getBoolean(Keys.git.enableGarbageCollection, false);

      boolean gcEnabled = app().settings().getBoolean(Keys.git.enableGarbageCollection, false);

      int defaultGcPeriod = app().settings().getInteger(Keys.git.defaultGarbageCollectionPeriod, 7);

      if (repositoryModel.gcPeriod == 0) {

         repositoryModel.gcPeriod = defaultGcPeriod;

      }

      List<Integer> gcPeriods = Arrays.asList(1, 2, 3, 4, 5, 7, 10, 14 );

      form.add(new DropDownChoice<Integer>("gcPeriod", gcPeriods, new GCPeriodRenderer()).setEnabled(gcEnabled));

      form.add(new TextField<String>("gcThreshold").setEnabled(gcEnabled));

@@ -445,13 +434,15 @@
      }

      form.add(new DropDownChoice<FederationStrategy>("federationStrategy", federationStrategies,

            new FederationTypeRenderer()));

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

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

      form.add(new CheckBox("acceptNewTickets"));
      form.add(new CheckBox("requireApproval"));

      form.add(new DropDownChoice<String>("mergeTo", availableBranches).setEnabled(availableBranches.size() > 0));

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

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

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

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

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

      List<Integer> maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500 );

      List<Integer> maxActivityCommits  = Arrays.asList(-1, 0, 25, 50, 75, 100, 150, 200, 250, 500);

      form.add(new DropDownChoice<Integer>("maxActivityCommits", maxActivityCommits, new MaxActivityCommitsRenderer()));



      metricAuthorExclusions = new Model<String>(ArrayUtils.isEmpty(repositoryModel.metricAuthorExclusions) ? ""

@@ -463,11 +454,6 @@
      form.add(new TextField<String>("mailingLists", mailingLists));

      form.add(indexedBranchesPalette);



      List<AuthorizationControl> acList = Arrays.asList(AuthorizationControl.values());

      final RadioChoice<AuthorizationControl> authorizationControl = new RadioChoice<Constants.AuthorizationControl>(

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

      form.add(authorizationControl);



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

      verifyCommitter.setOutputMarkupId(true);

      form.add(verifyCommitter);

@@ -476,27 +462,25 @@
      form.add(teamsPalette);

      form.add(federationSetsPalette);

      form.add(preReceivePalette);

      form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), GitBlit.self()

      form.add(new BulletListPanel("inheritedPreReceive", getString("gb.inherited"), app().repositories()

            .getPreReceiveScriptsInherited(repositoryModel)));

      form.add(postReceivePalette);

      form.add(new BulletListPanel("inheritedPostReceive", getString("gb.inherited"), GitBlit.self()

      form.add(new BulletListPanel("inheritedPostReceive", getString("gb.inherited"), app().repositories()

            .getPostReceiveScriptsInherited(repositoryModel)));



      WebMarkupContainer customFieldsSection = new WebMarkupContainer("customFieldsSection");

      customFieldsSection.add(customFieldsListView);

      form.add(customFieldsSection.setVisible(!GitBlit.getString(Keys.groovy.customFields, "").isEmpty()));

      form.add(customFieldsSection.setVisible(!app().settings().getString(Keys.groovy.customFields, "").isEmpty()));



      // initial enable/disable of permission controls

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

         // anonymous everything, disable all controls

         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);

@@ -504,15 +488,15 @@
         teamsPalette.setEnabled(allowFineGrainedControls);

      }



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

      AjaxFormChoiceComponentUpdatingBehavior callback = new AjaxFormChoiceComponentUpdatingBehavior() {



         private static final long serialVersionUID = 1L;



         @Override

         protected void onUpdate(AjaxRequestTarget target) {

            // enable/disable permissions panel based on access restriction

            accessPolicyPanel.updateModel(repositoryModel);



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

            authorizationControl.setEnabled(allowAuthorizationControl);

            verifyCommitter.setEnabled(allowAuthorizationControl);



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

@@ -523,36 +507,14 @@
               repositoryModel.authorizationControl = AuthorizationControl.NAMED;

            }



            target.addComponent(authorizationControl);

            target.addComponent(verifyCommitter);

            target.addComponent(usersPalette);

            target.addComponent(teamsPalette);

         }

      });

      };



      authorizationControl.add(new AjaxFormChoiceComponentUpdatingBehavior() {



         private static final long serialVersionUID = 1L;



         @Override

         protected void onUpdate(AjaxRequestTarget target) {

            // enable/disable permissions panel based on access restriction

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

            authorizationControl.setEnabled(allowAuthorizationControl);



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

            usersPalette.setEnabled(allowFineGrainedControls);

            teamsPalette.setEnabled(allowFineGrainedControls);



            if (allowFineGrainedControls) {

               repositoryModel.authorizationControl = AuthorizationControl.NAMED;

            }



            target.addComponent(authorizationControl);

            target.addComponent(usersPalette);

            target.addComponent(teamsPalette);

         }

      });

      accessPolicyPanel = new AccessPolicyPanel("accessPolicyPanel", repositoryModel, callback);

      form.add(accessPolicyPanel);



      List<CommitMessageRenderer> renderers = Arrays.asList(CommitMessageRenderer.values());

      DropDownChoice<CommitMessageRenderer> messageRendererChoice = new DropDownChoice<CommitMessageRenderer>("commitMessageRenderer", renderers);

@@ -564,11 +526,55 @@


         @Override

         public void onSubmit() {

            setResponsePage(RepositoriesPage.class);

            if (isCreate) {

               setResponsePage(RepositoriesPage.class);

            } else {

               setResponsePage(SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryModel.name));

            }

         }

      };

      cancel.setDefaultFormProcessing(false);

      form.add(cancel);



      // the user can delete if deletions are allowed AND the user is an admin or the personal owner

      // assigned ownership is not sufficient to allow deletion

      boolean canDelete = !isCreate && app().repositories().canDelete(repositoryModel)

            && (user.canAdmin() || user.isMyPersonalRepository(repositoryModel.name));



      Link<Void> delete = new Link<Void>("delete") {



         private static final long serialVersionUID = 1L;



         @Override

         public void onClick() {

            RepositoryModel latestModel = app().repositories().getRepositoryModel(repositoryModel.name);

            boolean canDelete = app().repositories().canDelete(latestModel);

            if (canDelete) {

               if (app().repositories().deleteRepositoryModel(latestModel)) {

                  info(MessageFormat.format(getString("gb.repositoryDeleted"), latestModel));

                  if (latestModel.isPersonalRepository()) {

                     // redirect to user's profile page

                     String prefix = app().settings().getString(Keys.git.userRepositoryPrefix, "~");

                     String username = latestModel.projectPath.substring(prefix.length());

                     setResponsePage(UserPage.class, WicketUtils.newUsernameParameter(username));

                  } else {

                     // redirect to server repositories page

                     setResponsePage(RepositoriesPage.class);

                  }

               } else {

                  error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), latestModel));

               }

            } else {

               error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), latestModel));

            }

         }

      };



      if (canDelete) {

         delete.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(

            getString("gb.deleteRepository"), repositoryModel)));

      }

      form.add(delete.setVisible(canDelete));



      add(form);

   }

@@ -581,8 +587,8 @@
    * Repository Owners should be able to edit their repository.

    */

   private void checkPermissions(RepositoryModel model) {

      boolean authenticateAdmin = GitBlit.getBoolean(Keys.web.authenticateAdminPages, true);

      boolean allowAdmin = GitBlit.getBoolean(Keys.web.allowAdministration, true);

      boolean authenticateAdmin = app().settings().getBoolean(Keys.web.authenticateAdminPages, true);

      boolean allowAdmin = app().settings().getBoolean(Keys.web.allowAdministration, true);



      GitBlitWebSession session = GitBlitWebSession.get();

      UserModel user = session.getUser();

@@ -619,27 +625,6 @@
      }

   }



   private class AccessRestrictionRenderer implements IChoiceRenderer<AccessRestrictionType> {



      private static final long serialVersionUID = 1L;



      private final Map<AccessRestrictionType, String> map;



      public AccessRestrictionRenderer() {

         map = getAccessRestrictions();

      }



      @Override

      public String getDisplayValue(AccessRestrictionType type) {

         return map.get(type);

      }



      @Override

      public String getIdValue(AccessRestrictionType type, int index) {

         return Integer.toString(index);

      }

   }



   private class FederationTypeRenderer implements IChoiceRenderer<FederationStrategy> {



      private static final long serialVersionUID = 1L;

@@ -657,27 +642,6 @@


      @Override

      public String getIdValue(FederationStrategy type, int index) {

         return Integer.toString(index);

      }

   }



   private class AuthorizationControlRenderer implements IChoiceRenderer<AuthorizationControl> {



      private static final long serialVersionUID = 1L;



      private final Map<AuthorizationControl, String> map;



      public AuthorizationControlRenderer() {

         map = getAuthorizationControls();

      }



      @Override

      public String getDisplayValue(AuthorizationControl type) {

         return map.get(type);

      }



      @Override

      public String getIdValue(AuthorizationControl type, int index) {

         return Integer.toString(index);

      }

   }