From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Thu, 29 Nov 2012 12:33:09 -0500
Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit.
---
src/com/gitblit/authority/NewClientCertificateDialog.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/authority/NewClientCertificateDialog.java b/src/com/gitblit/authority/NewClientCertificateDialog.java
index ad4fe9a..3d21439 100644
--- a/src/com/gitblit/authority/NewClientCertificateDialog.java
+++ b/src/com/gitblit/authority/NewClientCertificateDialog.java
@@ -16,6 +16,7 @@
package com.gitblit.authority;
import java.awt.BorderLayout;
+import java.awt.Dimension;
import java.awt.Frame;
import java.awt.GridLayout;
import java.awt.Insets;
@@ -30,6 +31,8 @@
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPasswordField;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
import javax.swing.JTextField;
import org.bouncycastle.util.Arrays;
@@ -50,12 +53,12 @@
JCheckBox sendEmail;
boolean isCanceled = true;
- public NewClientCertificateDialog(Frame owner, String displayname, Date defaultExpiration) {
+ public NewClientCertificateDialog(Frame owner, String displayname, Date defaultExpiration, boolean allowEmail) {
super(owner);
setTitle(Translation.get("gb.newCertificate"));
- JPanel content = new JPanel(new BorderLayout(5, 5)) {
+ JPanel content = new JPanel(new BorderLayout(Utils.MARGIN, Utils.MARGIN)) {
private static final long serialVersionUID = 1L;
@Override
@@ -64,7 +67,6 @@
return Utils.INSETS;
}
};
- content.add(new HeaderPanel(Translation.get("gb.newCertificate") + " (" + displayname + ")", "rosette_16x16.png"), BorderLayout.NORTH);
expirationDate = new JDateChooser(defaultExpiration);
pw1 = new JPasswordField(20);
@@ -72,7 +74,7 @@
hint = new JTextField(20);
sendEmail = new JCheckBox(Translation.get("gb.sendEmail"));
- JPanel panel = new JPanel(new GridLayout(0, 2, 5, 5));
+ JPanel panel = new JPanel(new GridLayout(0, 2, Utils.MARGIN, Utils.MARGIN));
panel.add(new JLabel(Translation.get("gb.expires")));
panel.add(expirationDate);
@@ -86,10 +88,11 @@
panel.add(new JLabel(Translation.get("gb.passwordHint")));
panel.add(hint);
- panel.add(new JLabel(""));
- panel.add(sendEmail);
+ if (allowEmail) {
+ panel.add(new JLabel(""));
+ panel.add(sendEmail);
+ }
- content.add(panel, BorderLayout.CENTER);
JButton ok = new JButton(Translation.get("gb.ok"));
ok.addActionListener(new ActionListener() {
@@ -112,8 +115,18 @@
controls.add(ok);
controls.add(cancel);
+ JTextArea message = new JTextArea(Translation.get("gb.newClientCertificateMessage"));
+ message.setLineWrap(true);
+ message.setWrapStyleWord(true);
+ message.setEditable(false);
+ message.setRows(6);
+ message.setPreferredSize(new Dimension(300, 100));
+
+ content.add(new JScrollPane(message), BorderLayout.CENTER);
+ content.add(panel, BorderLayout.NORTH);
content.add(controls, BorderLayout.SOUTH);
+ getContentPane().add(new HeaderPanel(Translation.get("gb.newCertificate") + " (" + displayname + ")", "rosette_16x16.png"), BorderLayout.NORTH);
getContentPane().add(content, BorderLayout.CENTER);
pack();
@@ -123,7 +136,7 @@
private boolean validateInputs() {
if (getExpiration().getTime() < System.currentTimeMillis()) {
// expires before now
- JOptionPane.showMessageDialog(this, Translation.get("gb.invalidExpiraitonDate"),
+ JOptionPane.showMessageDialog(this, Translation.get("gb.invalidExpirationDate"),
Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
return false;
}
--
Gitblit v1.9.1