From 2cdb73b442169b48da1588ab7cfaac7256677a5e Mon Sep 17 00:00:00 2001
From: Philip L. McMahon <philip.l.mcmahon@gmail.com>
Date: Sat, 28 Jan 2012 13:57:39 -0500
Subject: [PATCH] RepositoryModel will use String rather than RefModel to track the current symbolic head and available heads.
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 19 +------------------
1 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 6c04249..a16d7e4 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;
@@ -273,8 +272,7 @@
// 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()));
+ form.add(new DropDownChoice<String>("defaultHead", repositoryModel.availableHeads));
// federation strategies - remove ORIGIN choice if this repository has
// no origin.
@@ -362,21 +360,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