archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix the issue that wizard has not default button.

Browse Source
This commit is contained in:
robin shine 2013-09-28 11:17:20 +08:00
parent ae69ed4896
commit 87bd04e69b
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.html
View File

@ -7,8 +7,8 @@
<div class="buttons"> <div class="buttons">
<a wicket:id="previous" class="btn btn-default previous">Previous</a> <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="skip" class="btn btn-default skip">Skip</a>
<a wicket:id="next" class="btn btn-primary next">Next</a> <input type="submit" value="Next" wicket:id="next" class="btn btn-primary next"></input>
<a wicket:id="finish" class="btn btn-primary finish">Finish</a> <input type="submit" value="Finish" wicket:id="finish" class="btn btn-primary finish"></input>
</div> </div>
</form> </form>
</div> </div>

6
commons.wicket/src/main/java/com/pmease/commons/wicket/component/wizard/Wizard.java
View File

@ -16,8 +16,8 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label; 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.Form;
import org.apache.wicket.markup.html.form.SubmitLink;
import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel; 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 @Override
public void onSubmit() { public void onSubmit() {
@ -116,7 +116,7 @@ public abstract class Wizard extends Panel {
} }
}); });
form.add(new SubmitLink("finish") { form.add(new Button("finish") {
@Override @Override
public void onSubmit() { public void onSubmit() {

24
gitop.core/src/main/java/com/pmease/gitop/core/model/User.java
View File

@ -76,14 +76,23 @@ public class User extends AbstractUser implements ProtectedObject {
private Collection<UserAuthorizationByIndividual> authorizationsByIndividual = private Collection<UserAuthorizationByIndividual> authorizationsByIndividual =
new ArrayList<UserAuthorizationByIndividual>(); new ArrayList<UserAuthorizationByIndividual>();
@Editable @Editable(order=100)
@NotEmpty @NotEmpty
@Override @Override
public String getName() { public String getName() {
return super.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 @NotEmpty
@Email @Email
public String getEmail() { public String getEmail() {
@ -94,7 +103,7 @@ public class User extends AbstractUser implements ProtectedObject {
this.email = email; this.email = email;
} }
@Editable(name="Password") @Editable(name="Password", order=400)
@Password(confirmative=true) @Password(confirmative=true)
@NotEmpty @NotEmpty
@Override @Override
@ -102,15 +111,6 @@ public class User extends AbstractUser implements ProtectedObject {
return super.getPasswordHash(); return super.getPasswordHash();
} }
@Editable
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
public Collection<TeamMembership> getTeamMemberships() { public Collection<TeamMembership> getTeamMemberships() {
return teamMemberships; return teamMemberships;
} }