From 3eb83d71a5a1ed8385a606c7bdede066b1a00d72 Mon Sep 17 00:00:00 2001 From: saheba <mail@saheba.net> Date: Mon, 25 Mar 2013 16:32:06 -0400 Subject: [PATCH] added attribute useIncrementalRevisionNumbers to repository model --- src/com/gitblit/wicket/pages/ChangePasswordPage.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java index 5e66300..c401420 100644 --- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java +++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java @@ -51,12 +51,13 @@ throw new RestartResponseException(getApplication().getHomePage()); } - if (!GitBlit.self().supportsCredentialChanges()) { + UserModel user = GitBlitWebSession.get().getUser(); + if (!GitBlit.self().supportsCredentialChanges(user)) { error(MessageFormat.format(getString("gb.userServiceDoesNotPermitPasswordChanges"), - GitBlit.getString(Keys.realm.userService, "users.conf")), true); + GitBlit.getString(Keys.realm.userService, "${baseFolder}/users.conf")), true); } - setupPage(getString("gb.changePassword"), GitBlitWebSession.get().getUsername()); + setupPage(getString("gb.changePassword"), user.username); StatelessForm<Void> form = new StatelessForm<Void>("passwordForm") { -- Gitblit v1.9.1