From 2654d99368054b7f8cfaec056b599cac4cfb53d9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 09:48:27 -0400
Subject: [PATCH] Merge branch 'ticket/196' into develop
---
src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
index 0134677..b6c2359 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewRepositoryPage.java
@@ -56,9 +56,10 @@
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.panels.AccessPolicyPanel;
-import com.gitblit.wicket.panels.CheckboxOption;
-import com.gitblit.wicket.panels.ConditionalChoiceOption;
+import com.gitblit.wicket.panels.BooleanChoiceOption;
+import com.gitblit.wicket.panels.BooleanOption;
import com.gitblit.wicket.panels.RepositoryNamePanel;
+import com.google.common.base.Optional;
public class NewRepositoryPage extends RootSubPage {
@@ -142,7 +143,6 @@
} catch (GitBlitException e) {
error(e.getMessage());
- namePanel.resetModel(repositoryModel);
return;
}
setRedirect(true);
@@ -181,7 +181,7 @@
// add README
addReadmeModel = Model.of(false);
- form.add(new CheckboxOption("addReadme",
+ form.add(new BooleanOption("addReadme",
getString("gb.initWithReadme"),
getString("gb.initWithReadmeDescription"),
addReadmeModel));
@@ -202,7 +202,7 @@
gitignoreModel = Model.of("");
addGitignoreModel = Model.of(false);
- form.add(new ConditionalChoiceOption<String>("addGitIgnore",
+ form.add(new BooleanChoiceOption<String>("addGitIgnore",
getString("gb.initWithGitignore"),
getString("gb.initWithGitignoreDescription"),
addGitignoreModel,
@@ -211,7 +211,7 @@
// TODO consider gitflow at creation (ticket-55)
addGitflowModel = Model.of(false);
- form.add(new CheckboxOption("addGitFlow",
+ form.add(new BooleanOption("addGitFlow",
"Include a .gitflow file",
"This will generate a config file which guides Git clients in setting up Gitflow branches.",
addGitflowModel).setVisible(false));
@@ -244,7 +244,8 @@
try {
UserModel user = GitBlitWebSession.get().getUser();
- PersonIdent author = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ String email = Optional.fromNullable(user.emailAddress).or(user.username + "@" + "gitblit");
+ PersonIdent author = new PersonIdent(user.getDisplayName(), email);
DirCache newIndex = DirCache.newInCore();
DirCacheBuilder indexBuilder = newIndex.builder();
--
Gitblit v1.9.1