Merge multiple owners feature (pull request #63, #66)

SHaselbauer

2013-01-21 fb9813874c811ae06604c30d875e9dce57df9874

 src/com/gitblit/client/EditRepositoryDialog.java

@@ -124,6 +124,8 @@
   private JComboBox gcPeriod;

   

   private JTextField gcThreshold;

	
   private JComboBox maxActivityCommits;



   private RegistrantPermissionsPanel usersPalette;



@@ -225,6 +227,9 @@
      isFrozen = new JCheckBox(Translation.get("gb.isFrozenDescription"),

            anRepository.isFrozen);



      maxActivityCommits = new JComboBox(new Integer [] { -1, 0, 25, 50, 75, 100, 150, 250, 500 });

      maxActivityCommits.setSelectedItem(anRepository.maxActivityCommits);



      mailingListsField = new JTextField(

            ArrayUtils.isEmpty(anRepository.mailingLists) ? ""

                  : StringUtils.flattenStrings(anRepository.mailingLists,

@@ -250,7 +255,7 @@
      allowAuthenticated.addItemListener(new ItemListener() {

         @Override

         public void itemStateChanged(ItemEvent e) {

            if (e.getStateChange() == ItemEvent.SELECTED) {

            if (e.getStateChange() == ItemEvent.SELECTED) {					
               usersPalette.setEnabled(false);

               teamsPalette.setEnabled(false);

            }

@@ -314,6 +319,8 @@
                  skipSizeCalculation));

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

            skipSummaryMetrics));

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

            maxActivityCommits));

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

            mailingListsField));



@@ -328,7 +335,7 @@
      usersPalette = new RegistrantPermissionsPanel(RegistrantType.USER);



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

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

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

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

            accessRestriction), BorderLayout.NORTH);



@@ -462,9 +469,11 @@
         

         allowAuthenticated.setEnabled(false);

         allowNamed.setEnabled(false);

         verifyCommitter.setEnabled(false);

      } else {

         allowAuthenticated.setEnabled(true);

         allowNamed.setEnabled(true);

         verifyCommitter.setEnabled(true);

         

         if (allowNamed.isSelected()) {

            usersPalette.setEnabled(true);

@@ -547,8 +556,8 @@


      repository.name = rname;

      repository.description = descriptionField.getText();

      repository.owner = ownerField.getSelectedItem() == null ? null

            : ownerField.getSelectedItem().toString();

      repository.addRepoAdministrator(ownerField.getSelectedItem() == null ? null

            : ownerField.getSelectedItem().toString());

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

            : headRefField.getSelectedItem().toString();

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

@@ -559,6 +568,7 @@
      repository.showReadme = showReadme.isSelected();

      repository.skipSizeCalculation = skipSizeCalculation.isSelected();

      repository.skipSummaryMetrics = skipSummaryMetrics.isSelected();

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

      

      repository.isFrozen = isFrozen.isSelected();

      repository.allowForks = allowForks.isSelected();