From 4be52863f9ec6bfbfec12fdc1aa3cefa867a1945 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 21 Mar 2012 22:39:30 -0400 Subject: [PATCH] Adjusted spacing on activity page --- src/com/gitblit/wicket/pages/EditRepositoryPage.java | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java index 172859f..5b2124a 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java @@ -39,7 +39,6 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.util.CollectionModel; import org.apache.wicket.model.util.ListModel; -import org.eclipse.jgit.lib.Constants; import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.Constants.FederationStrategy; @@ -117,14 +116,8 @@ new StringChoiceRenderer(), 8, false); // indexed local branches palette - List<String> allLocalBranches = new ArrayList<String>(); - if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) { - for (String ref : repositoryModel.availableRefs) { - if (ref.startsWith(Constants.R_HEADS)) { - allLocalBranches.add(ref); - } - } - } + List<String> allLocalBranches = repositoryModel.getLocalBranches(); + final Palette<String> indexedBranchesPalette = new Palette<String>("indexedBranches", new ListModel<String>( indexedBranches), new CollectionModel<String>(allLocalBranches), new StringChoiceRenderer(), 8, false); @@ -309,7 +302,7 @@ if (!ArrayUtils.isEmpty(repositoryModel.availableRefs)) { availableRefs.addAll(repositoryModel.availableRefs); } - form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(!isCreate)); + form.add(new DropDownChoice<String>("HEAD", availableRefs).setEnabled(availableRefs.size() > 0)); // federation strategies - remove ORIGIN choice if this repository has // no origin. -- Gitblit v1.9.1