From 618d1691dc0003c8243942354d81dd35a195a94e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 06 Nov 2012 17:15:18 -0500
Subject: [PATCH] Fixed regression in setting up Lucene executor
---
src/com/gitblit/wicket/pages/ChangePasswordPage.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 4fb5d23..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") {
--
Gitblit v1.9.1