From d4b95298902c8cea1411fc696ed80028b6091aa7 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Thu, 06 Dec 2012 11:25:01 -0500
Subject: [PATCH] Update from upstream/master
---
src/com/gitblit/wicket/pages/ChangePasswordPage.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 5e15c8f..5e66300 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -50,7 +50,13 @@
// no authentication enabled
throw new RestartResponseException(getApplication().getHomePage());
}
- setupPage(getString("gb.changePassword"), GitBlitWebSession.get().getUser().username);
+
+ if (!GitBlit.self().supportsCredentialChanges()) {
+ error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"),
+ GitBlit.getString(Keys.realm.userService, "users.conf")), true);
+ }
+
+ setupPage(getString("gb.changePassword"), GitBlitWebSession.get().getUsername());
StatelessForm<Void> form = new StatelessForm<Void>("passwordForm") {
@@ -113,8 +119,8 @@
confirmPasswordField.setResetPassword(false);
form.add(confirmPasswordField);
- form.add(new Button(getString("gb.save")));
- Button cancel = new Button(getString("gb.cancel")) {
+ form.add(new Button("save"));
+ Button cancel = new Button("cancel") {
private static final long serialVersionUID = 1L;
@Override
--
Gitblit v1.9.1