From d394d950100a97b7d73f0e162b64b0b8f3cef988 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 Feb 2012 19:14:06 -0500
Subject: [PATCH] Added some logging for relinking HEAD
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 6c04249..ec52aaf 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -45,7 +45,6 @@
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.Keys;
-import com.gitblit.models.RefModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
@@ -272,9 +271,13 @@
form.add(new CheckBox("isFrozen"));
// TODO enable origin definition
form.add(new TextField<String>("origin").setEnabled(false/* isCreate */));
- // enable alteration of the default branch after clone
- form.add(new DropDownChoice<RefModel>("defaultHead", repositoryModel.availableHeads,
- new RefModelRenderer()).setEnabled(GitBlitWebSession.get().canAdmin()));
+
+ // 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);
+ }
+ form.add(new DropDownChoice<String>("defaultHead", availableHeads).setEnabled(!isCreate));
// federation strategies - remove ORIGIN choice if this repository has
// no origin.
@@ -362,21 +365,6 @@
} else {
// No Administration Permitted
error("Administration is disabled", true);
- }
- }
-
- private class RefModelRenderer implements IChoiceRenderer<RefModel> {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getDisplayValue(RefModel type) {
- return type.displayName;
- }
-
- @Override
- public String getIdValue(RefModel type, int index) {
- return type.getName();
}
}
--
Gitblit v1.9.1