Moved owner field onto access permissions tab

James Moger

2012-10-30 abcb146f0c4e5c99e5e44349a65e6fd49e9296d9

 src/com/gitblit/client/EditRepositoryDialog.java

@@ -120,6 +120,10 @@
   private JComboBox ownerField;



   private JComboBox headRefField;

	
   private JComboBox gcPeriod;

	
   private JTextField gcThreshold;



   private RegistrantPermissionsPanel usersPalette;



@@ -193,6 +197,13 @@
               anRepository.availableRefs.toArray());

         headRefField.setSelectedItem(anRepository.HEAD);

      }

		
      Integer []  gcPeriods =  { 1, 2, 3, 4, 5, 7, 10, 14 };

      gcPeriod = new JComboBox(gcPeriods);

      gcPeriod.setSelectedItem(anRepository.gcPeriod);

		
      gcThreshold = new JTextField(8);

      gcThreshold.setText(anRepository.gcThreshold);



      ownerField = new JComboBox();



@@ -287,7 +298,8 @@
      fieldsPanel

            .add(newFieldPanel(Translation.get("gb.origin"), originField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.headRef"), headRefField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.gcPeriod"), gcPeriod));

      fieldsPanel.add(newFieldPanel(Translation.get("gb.gcThreshold"), gcThreshold));



      fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"),

            useTickets));

@@ -314,9 +326,14 @@
      .add(newFieldPanel(Translation.get("gb.verifyCommitter"), verifyCommitter));



      usersPalette = new RegistrantPermissionsPanel(RegistrantType.USER);

      JPanel northAccessPanel = new JPanel(new BorderLayout(5, 5));

      northAccessPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"),



      JPanel northFieldsPanel = new JPanel(new GridLayout(0, 1, 0, 5));

      northFieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));

      northFieldsPanel.add(newFieldPanel(Translation.get("gb.accessRestriction"),

            accessRestriction), BorderLayout.NORTH);



      JPanel northAccessPanel = new JPanel(new BorderLayout(5, 5));

      northAccessPanel.add(northFieldsPanel, BorderLayout.NORTH);

      northAccessPanel.add(newFieldPanel(Translation.get("gb.authorizationControl"),

            authorizationPanel), BorderLayout.CENTER);

      northAccessPanel.add(clonePushPanel, BorderLayout.SOUTH);

@@ -534,6 +551,8 @@
            : ownerField.getSelectedItem().toString();

      repository.HEAD = headRefField.getSelectedItem() == null ? null

            : headRefField.getSelectedItem().toString();

      repository.gcPeriod = (Integer) gcPeriod.getSelectedItem();

      repository.gcThreshold = gcThreshold.getText();

      repository.useTickets = useTickets.isSelected();

      repository.useDocs = useDocs.isSelected();

      repository.showRemoteBranches = showRemoteBranches.isSelected();