From e1908933fa9968b11e9ea03d88730aee3140534b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 15 Oct 2013 09:43:09 -0400
Subject: [PATCH] Fix error on generating activity page when there is no activity
---
src/main/java/com/gitblit/client/EditUserDialog.java | 64 +++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/gitblit/client/EditUserDialog.java b/src/main/java/com/gitblit/client/EditUserDialog.java
index 0400f5c..fd5cf79 100644
--- a/src/main/java/com/gitblit/client/EditUserDialog.java
+++ b/src/main/java/com/gitblit/client/EditUserDialog.java
@@ -47,6 +47,7 @@
import javax.swing.JTextField;
import javax.swing.KeyStroke;
+import com.gitblit.Constants;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.PermissionType;
@@ -78,29 +79,29 @@
private JPasswordField passwordField;
private JPasswordField confirmPasswordField;
-
+
private JTextField displayNameField;
-
+
private JTextField emailAddressField;
private JCheckBox canAdminCheckbox;
-
+
private JCheckBox canForkCheckbox;
-
+
private JCheckBox canCreateCheckbox;
private JCheckBox notFederatedCheckbox;
-
+
private JTextField organizationalUnitField;
-
+
private JTextField organizationField;
private JTextField localityField;
-
+
private JTextField stateProvinceField;
-
+
private JTextField countryCodeField;
-
+
private RegistrantPermissionsPanel repositoryPalette;
private JPalette<TeamModel> teamsPalette;
@@ -131,6 +132,7 @@
KeyStroke stroke = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0);
JRootPane rootPane = new JRootPane();
rootPane.registerKeyboardAction(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent actionEvent) {
setVisible(false);
}
@@ -145,19 +147,19 @@
25);
displayNameField = new JTextField(anUser.displayName == null ? "" : anUser.displayName, 25);
emailAddressField = new JTextField(anUser.emailAddress == null ? "" : anUser.emailAddress, 25);
- canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);
+ canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin);
canForkCheckbox = new JCheckBox(Translation.get("gb.canForkDescription"), anUser.canFork);
canCreateCheckbox = new JCheckBox(Translation.get("gb.canCreateDescription"), anUser.canCreate);
notFederatedCheckbox = new JCheckBox(
Translation.get("gb.excludeFromFederationDescription"),
anUser.excludeFromFederation);
-
+
organizationalUnitField = new JTextField(anUser.organizationalUnit == null ? "" : anUser.organizationalUnit, 25);
organizationField = new JTextField(anUser.organization == null ? "" : anUser.organization, 25);
localityField = new JTextField(anUser.locality == null ? "" : anUser.locality, 25);
stateProvinceField = new JTextField(anUser.stateProvince == null ? "" : anUser.stateProvince, 25);
countryCodeField = new JTextField(anUser.countryCode == null ? "" : anUser.countryCode, 15);
-
+
// credentials are optionally controlled by 3rd-party authentication
usernameField.setEnabled(settings.supportsCredentialChanges);
passwordField.setEnabled(settings.supportsCredentialChanges);
@@ -165,7 +167,7 @@
displayNameField.setEnabled(settings.supportsDisplayNameChanges);
emailAddressField.setEnabled(settings.supportsEmailAddressChanges);
-
+
organizationalUnitField.setEnabled(settings.supportsDisplayNameChanges);
organizationField.setEnabled(settings.supportsDisplayNameChanges);
localityField.setEnabled(settings.supportsDisplayNameChanges);
@@ -190,7 +192,7 @@
attributesPanel.add(newFieldPanel(Translation.get("gb.locality") + " (L)", localityField));
attributesPanel.add(newFieldPanel(Translation.get("gb.stateProvince") + " (ST)", stateProvinceField));
attributesPanel.add(newFieldPanel(Translation.get("gb.countryCode") + " (C)", countryCodeField));
-
+
final Insets _insets = new Insets(5, 5, 5, 5);
repositoryPalette = new RegistrantPermissionsPanel(RegistrantType.REPOSITORY);
teamsPalette = new JPalette<TeamModel>();
@@ -206,6 +208,7 @@
private static final long serialVersionUID = 1L;
+ @Override
public Insets getInsets() {
return _insets;
}
@@ -216,6 +219,7 @@
private static final long serialVersionUID = 1L;
+ @Override
public Insets getInsets() {
return _insets;
}
@@ -232,6 +236,7 @@
JButton createButton = new JButton(Translation.get("gb.save"));
createButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
if (validateFields()) {
canceled = false;
@@ -242,6 +247,7 @@
JButton cancelButton = new JButton(Translation.get("gb.cancel"));
cancelButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
canceled = true;
setVisible(false);
@@ -348,7 +354,7 @@
// no change in password
user.password = password;
}
-
+
user.displayName = displayNameField.getText().trim();
user.emailAddress = emailAddressField.getText().trim();
@@ -362,7 +368,7 @@
user.locality = localityField.getText().trim();
user.stateProvince = stateProvinceField.getText().trim();
user.countryCode = countryCodeField.getText().trim();
-
+
for (RegistrantAccessPermission rp : repositoryPalette.getPermissions()) {
user.setRepositoryPermission(rp.registrant, rp.permission);
}
@@ -393,17 +399,31 @@
if (repo.accessRestriction.exceeds(AccessRestrictionType.NONE)
&& repo.authorizationControl.equals(AuthorizationControl.NAMED)) {
restricted.add(repo.name);
- }
+ }
}
repoMap.put(repo.name.toLowerCase(), repo);
}
StringUtils.sortRepositorynames(restricted);
-
+
List<String> list = new ArrayList<String>();
// repositories
list.add(".*");
- // all repositories excluding personal repositories
- list.add("[^~].*");
+
+ String prefix;
+ if (settings.hasKey(Keys.git.userRepositoryPrefix)) {
+ prefix = settings.get(Keys.git.userRepositoryPrefix).currentValue;
+ if (StringUtils.isEmpty(prefix)) {
+ prefix = Constants.DEFAULT_USER_REPOSITORY_PREFIX;
+ }
+ } else {
+ prefix = Constants.DEFAULT_USER_REPOSITORY_PREFIX;
+ }
+
+ if (prefix.length() == 1) {
+ // all repositories excluding personal repositories
+ list.add("[^" + prefix + "].*");
+ }
+
String lastProject = null;
for (String repo : restricted) {
String projectPath = StringUtils.getFirstPathElement(repo).toLowerCase();
@@ -425,7 +445,7 @@
list.remove(rp.registrant.toLowerCase());
}
}
-
+
// update owner and missing permissions for editing
for (RegistrantAccessPermission permission : permissions) {
if (permission.mutable && PermissionType.EXPLICIT.equals(permission.permissionType)) {
@@ -456,7 +476,7 @@
}
teamsPalette.setObjects(teams, selected);
}
-
+
public UserModel getUser() {
if (canceled) {
return null;
--
Gitblit v1.9.1