From f6a048e0f78066f03e9f936e6d6acece1cfc9099 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Mon, 4 Dec 2017 19:59:48 +0900
Subject: [PATCH] FeedAdd validation for sourceUrl

---
 .../scala/gitbucket/core/controller/AccountController.scala     | 2 +-
 src/main/twirl/gitbucket/core/account/newrepo.scala.html        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala
index ebf79711f..239bdf6af 100644
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -98,7 +98,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
     "description" -> trim(label("Description", optional(text()))),
     "isPrivate" -> trim(label("Repository Type", boolean())),
     "initOption" -> trim(label("Initialize option", text(required))),
-    "sourceUrl" -> trim(label("Source git repository URL", optional(text()))) // TODO required if initOption is "COPY"
+    "sourceUrl" -> trim(label("Source URL", optionalRequired(_.value("initOption") == "COPY", text())))
   )(RepositoryCreationForm.apply)
 
   val forkRepositoryForm = mapping(
diff --git a/src/main/twirl/gitbucket/core/account/newrepo.scala.html b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
index d64531790..32ae64520 100644
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -81,6 +81,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
         </label>
       </fieldset>
       <input type="text" class="form-control" name="sourceUrl" id="sourceUrl" disabled placeholder="Source git repository URL..."/>
+      <span id="error-sourceUrl" class="error"></span>
       <fieldset class="border-top form-actions">
         <input type="submit" class="btn btn-success" value="Create repository"/>
       </fieldset>