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/EditRepositoryPage.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index ec52aaf..0361da3 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -26,6 +26,7 @@
import java.util.Set;
import org.apache.wicket.PageParameters;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
import org.apache.wicket.extensions.markup.html.form.palette.Palette;
import org.apache.wicket.markup.html.form.Button;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -261,6 +262,9 @@
}
};
+ // do not let the browser pre-populate these fields
+ form.add(new SimpleAttributeModifier("autocomplete", "off"));
+
// field names reflective match RepositoryModel fields
form.add(new TextField<String>("name").setEnabled(isCreate || isAdmin));
form.add(new TextField<String>("description"));
@@ -273,11 +277,11 @@
form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));
// allow relinking HEAD to a branch or tag other than master on edit repository
- List<String> availableHeads = new ArrayList<String>();
- if (!ArrayUtils.isEmpty(repositoryModel.availableHeads)) {
- availableHeads.addAll(repositoryModel.availableHeads);
+ List<String> availableRefs = new ArrayList<String>();
+ if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) {
+ availableRefs.addAll(repositoryModel.availableRefs);
}
- form.add(new DropDownChoice<String>("defaultHead", availableHeads).setEnabled(!isCreate));
+ form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(!isCreate));
// federation strategies - remove ORIGIN choice if this repository has
// no origin.
--
Gitblit v1.9.1