From 3980c1e48e604fd743f4622771602941b7ede9d4 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 25 Apr 2012 17:39:18 -0400 Subject: [PATCH] Allow manipulating display name and email address from manager app --- src/com/gitblit/client/EditUserDialog.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/client/EditUserDialog.java b/src/com/gitblit/client/EditUserDialog.java index f3665d9..d78924c 100644 --- a/src/com/gitblit/client/EditUserDialog.java +++ b/src/com/gitblit/client/EditUserDialog.java @@ -72,6 +72,10 @@ private JPasswordField passwordField; private JPasswordField confirmPasswordField; + + private JTextField displayNameField; + + private JTextField emailAddressField; private JCheckBox canAdminCheckbox; @@ -119,7 +123,9 @@ passwordField = new JPasswordField(anUser.password == null ? "" : anUser.password, 25); confirmPasswordField = new JPasswordField(anUser.password == null ? "" : anUser.password, 25); - canAdminCheckbox = new JCheckBox(Translation.get("gb.canAdminDescription"), anUser.canAdmin); + 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); notFederatedCheckbox = new JCheckBox( Translation.get("gb.excludeFromFederationDescription"), anUser.excludeFromFederation); @@ -128,6 +134,8 @@ fieldsPanel.add(newFieldPanel(Translation.get("gb.username"), usernameField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.password"), passwordField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.confirmPassword"), confirmPasswordField)); + fieldsPanel.add(newFieldPanel(Translation.get("gb.displayName"), displayNameField)); + fieldsPanel.add(newFieldPanel(Translation.get("gb.emailAddress"), emailAddressField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.canAdmin"), canAdminCheckbox)); fieldsPanel.add(newFieldPanel(Translation.get("gb.excludeFromFederation"), notFederatedCheckbox)); @@ -284,6 +292,9 @@ // no change in password user.password = password; } + + user.displayName = displayNameField.getText().trim(); + user.emailAddress = emailAddressField.getText().trim(); user.canAdmin = canAdminCheckbox.isSelected(); user.excludeFromFederation = notFederatedCheckbox.isSelected(); -- Gitblit v1.9.1