Merged #187 "Restrict Gitblit cookie to the context path"

James Moger

2014-09-25 54cc7d7c2483d7ca100a5db47f4e1e98bd97c7fe

 src/main/java/com/gitblit/client/EditUserDialog.java

@@ -92,6 +92,8 @@


   private JCheckBox notFederatedCheckbox;



   private JCheckBox disabledCheckbox;



   private JTextField organizationalUnitField;



   private JTextField organizationField;

@@ -153,6 +155,7 @@
      notFederatedCheckbox = new JCheckBox(

            Translation.get("gb.excludeFromFederationDescription"),

            anUser.excludeFromFederation);

      disabledCheckbox = new JCheckBox(Translation.get("gb.disableUserDescription"), anUser.disabled);



      organizationalUnitField = new JTextField(anUser.organizationalUnit == null ? "" : anUser.organizationalUnit, 25);

      organizationField = new JTextField(anUser.organization == null ? "" : anUser.organization, 25);

@@ -176,6 +179,7 @@
      fieldsPanel.add(newFieldPanel(Translation.get("gb.canCreate"), canCreateCheckbox));

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

            notFederatedCheckbox));

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



      JPanel attributesPanel = new JPanel(new GridLayout(0, 1, 5, 2));

      attributesPanel.add(newFieldPanel(Translation.get("gb.organizationalUnit") + " (OU)", organizationalUnitField));

@@ -355,6 +359,7 @@
      user.canFork = canForkCheckbox.isSelected();

      user.canCreate = canCreateCheckbox.isSelected();

      user.excludeFromFederation = notFederatedCheckbox.isSelected();

      user.disabled = disabledCheckbox.isSelected();



      user.organizationalUnit = organizationalUnitField.getText().trim();

      user.organization = organizationField.getText().trim();