From bc5b7bab1eab81620616ba9d62dedff3d9eef52f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 31 Mar 2012 08:52:32 -0400
Subject: [PATCH] Documentation
---
src/com/gitblit/wicket/pages/EditRepositoryPage.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.java b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
index 172859f..af1b2b4 100644
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.java
@@ -39,10 +39,10 @@
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;
+import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.Keys;
@@ -118,18 +118,13 @@
// 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);
- }
- }
- }
+ allLocalBranches.add(Constants.DEFAULT_BRANCH);
+ allLocalBranches.addAll(repositoryModel.getLocalBranches());
+ boolean luceneEnabled = GitBlit.getBoolean(Keys.web.allowLuceneIndexing, true);
final Palette<String> indexedBranchesPalette = new Palette<String>("indexedBranches", new ListModel<String>(
indexedBranches), new CollectionModel<String>(allLocalBranches),
new StringChoiceRenderer(), 8, false);
- indexedBranchesPalette.setEnabled(allLocalBranches.size() > 0);
-
+ indexedBranchesPalette.setEnabled(luceneEnabled);
// federation sets palette
List<String> sets = GitBlit.getStrings(Keys.federation.sets);
@@ -166,7 +161,7 @@
try {
// confirm a repository name was entered
if (StringUtils.isEmpty(repositoryModel.name)) {
- error("Please set repository name!");
+ error(getString("gb.pleaseSetRepositoryName"));
return;
}
@@ -177,35 +172,35 @@
// prohibit folder paths
if (repositoryModel.name.startsWith("/")) {
- error("Leading root folder references (/) are prohibited.");
+ error(getString("gb.illegalLeadingSlash"));
return;
}
if (repositoryModel.name.startsWith("../")) {
- error("Relative folder references (../) are prohibited.");
+ error(getString("gb.illegalRelativeSlash"));
return;
}
if (repositoryModel.name.contains("/../")) {
- error("Relative folder references (../) are prohibited.");
+ error(getString("gb.illegalRelativeSlash"));
return;
}
// confirm valid characters in repository name
Character c = StringUtils.findInvalidCharacter(repositoryModel.name);
if (c != null) {
- error(MessageFormat.format("Illegal character ''{0}'' in repository name!",
+ error(MessageFormat.format(getString("gb.illegalCharacterRepositoryName"),
c));
return;
}
// confirm access restriction selection
if (repositoryModel.accessRestriction == null) {
- error("Please select access restriction!");
+ error(getString("gb.selectAccessRestriction"));
return;
}
// confirm federation strategy selection
if (repositoryModel.federationStrategy == null) {
- error("Please select federation strategy!");
+ error(getString("gb.selectFederationStrategy"));
return;
}
@@ -309,7 +304,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