Use AccessPolicyPanel in EditRepositoryPage

James Moger

2014-05-31 6a437ec4a6853bdd15f7c33f7fbafdd247a3790c

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

@@ -29,7 +29,6 @@
import org.apache.wicket.markup.html.form.CheckBox;

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

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

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

import org.apache.wicket.model.CompoundPropertyModel;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.Model;

@@ -60,8 +59,8 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.AccessPolicyPanel;

import com.gitblit.wicket.panels.RepositoryNamePanel;

import com.gitblit.wicket.panels.RepositoryPermissionPanel;



public class NewRepositoryPage extends RootSubPage {



@@ -70,7 +69,7 @@
   private Model<String> gitignoreModel;

   private IModel<Boolean> addGitflowModel;

   private IModel<Boolean> addGitignoreModel;

   private RepositoryPermissionPanel permissionPanel;

   private AccessPolicyPanel accessPolicyPanel;

   private RepositoryNamePanel namePanel;



   public NewRepositoryPage() {

@@ -109,7 +108,7 @@
               if (!namePanel.updateModel(repositoryModel)) {

                  return;

               }

               permissionPanel.updateModel(repositoryModel);

               accessPolicyPanel.updateModel(repositoryModel);



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

               repositoryModel.owners.add(GitBlitWebSession.get().getUsername());

@@ -159,8 +158,6 @@
      namePanel = new RepositoryNamePanel("namePanel", repositoryModel);

      form.add(namePanel);



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



      // prepare the default access controls

      AccessRestrictionType defaultRestriction = AccessRestrictionType.fromName(

            app().settings().getString(Keys.git.defaultAccessRestriction, AccessRestrictionType.PUSH.name()));

@@ -177,8 +174,8 @@
      repositoryModel.authorizationControl = defaultControl;

      repositoryModel.accessRestriction = defaultRestriction;



      permissionPanel = new RepositoryPermissionPanel("permissionPanel", repositoryModel);

      form.add(permissionPanel);

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

      form.add(accessPolicyPanel);



      //

      // initial commit options