From 5cc40c89abafdcccbc8a5b2cf3890780ccff908e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 09 Feb 2012 17:41:23 -0500
Subject: [PATCH] Rearranged button order to properly set default (issue 60)
---
src/com/gitblit/wicket/pages/ChangePasswordPage.html | 4 ++--
src/com/gitblit/wicket/pages/ChangePasswordPage.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.html b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
index 938e0ec..e72ef1e 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.html
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.html
@@ -19,8 +19,8 @@
<td class="edit"><input type="password" wicket:id="confirmPassword" size="30" tabindex="2" /></td>
</tr>
</table>
- <input class="btn" type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="3" />
- <input class="btn primary" type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="4" />
+ <input class="btn primary" type="submit" wicket:message="value:gb.save" wicket:id="save" tabindex="3" />
+ <input class="btn" type="submit" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="4" />
</center>
</form>
</div>
diff --git a/src/com/gitblit/wicket/pages/ChangePasswordPage.java b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
index 2738a5f..d7c774d 100644
--- a/src/com/gitblit/wicket/pages/ChangePasswordPage.java
+++ b/src/com/gitblit/wicket/pages/ChangePasswordPage.java
@@ -120,6 +120,8 @@
@Override
public void onSubmit() {
+ setRedirect(false);
+ error("Password change aborted.");
setResponsePage(RepositoriesPage.class);
}
};
--
Gitblit v1.9.1