From 87bd04e69bd9e0849e39111a7cca2fb5b2e4faa0 Mon Sep 17 00:00:00 2001
From: robin shine <robin@pmease.com>
Date: Sat, 28 Sep 2013 11:17:20 +0800
Subject: [PATCH] Fix the issue that wizard has not default button.

---
 .../wicket/component/wizard/Wizard.html       |  4 ++--
 .../wicket/component/wizard/Wizard.java       |  6 ++---
 .../com/pmease/gitop/core/model/User.java     | 24 +++++++++----------
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.html b/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.html
index 94f82abb68..37aab505ed 100644
--- a/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.html
+++ b/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.html
@@ -7,8 +7,8 @@
 				<div class="buttons">
 					<a wicket:id="previous" class="btn btn-default previous">Previous</a> 
 					<a wicket:id="skip" class="btn btn-default skip">Skip</a> 
-					<a wicket:id="next" class="btn btn-primary next">Next</a> 
-					<a wicket:id="finish" class="btn btn-primary finish">Finish</a>
+					<input type="submit" value="Next" wicket:id="next" class="btn btn-primary next"></input> 
+					<input type="submit" value="Finish" wicket:id="finish" class="btn btn-primary finish"></input>
 				</div>
 		</form>
 		</div>
diff --git a/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.java b/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.java
index cdb54b3fc3..622cb2b5db 100644
--- a/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.java
+++ b/commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.java
@@ -16,8 +16,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.SubmitLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -99,7 +99,7 @@ public abstract class Wizard extends Panel {
 			}
 
 		});
-		form.add(new SubmitLink("next") {
+		form.add(new Button("next") {
 
 			@Override
 			public void onSubmit() {
@@ -116,7 +116,7 @@ public abstract class Wizard extends Panel {
 			}
 
 		});
-		form.add(new SubmitLink("finish") {
+		form.add(new Button("finish") {
 
 			@Override
 			public void onSubmit() {
diff --git a/gitop.core/src/main/java/com/pmease/gitop/core/model/User.java b/gitop.core/src/main/java/com/pmease/gitop/core/model/User.java
index bce27a4ffb..e39a3e97a4 100644
--- a/gitop.core/src/main/java/com/pmease/gitop/core/model/User.java
+++ b/gitop.core/src/main/java/com/pmease/gitop/core/model/User.java
@@ -76,14 +76,23 @@ public class User extends AbstractUser implements ProtectedObject {
 	private Collection<UserAuthorizationByIndividual> authorizationsByIndividual = 
 			new ArrayList<UserAuthorizationByIndividual>();
 
-	@Editable
+	@Editable(order=100)
 	@NotEmpty
 	@Override
 	public String getName() {
 		return super.getName();
 	}
 
-	@Editable
+	@Editable(order=200)
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	@Editable(order=300)
 	@NotEmpty
 	@Email
 	public String getEmail() {
@@ -94,7 +103,7 @@ public class User extends AbstractUser implements ProtectedObject {
 		this.email = email;
 	}
 
-	@Editable(name="Password")
+	@Editable(name="Password", order=400)
 	@Password(confirmative=true)
 	@NotEmpty
 	@Override
@@ -102,15 +111,6 @@ public class User extends AbstractUser implements ProtectedObject {
 		return super.getPasswordHash();
 	}
 
-	@Editable
-	public String getFullName() {
-		return fullName;
-	}
-
-	public void setFullName(String fullName) {
-		this.fullName = fullName;
-	}
-
 	public Collection<TeamMembership> getTeamMemberships() {
 		return teamMemberships;
 	}