Merge remote-tracking branch 'origin/master'

src/main/scala/app/IssuesController.scala

@@ -14,13 +14,26 @@ trait IssuesControllerBase extends ControllerBase {
   self: IssuesService with RepositoryService with LabelsService with MilestonesService
     with UsersOnlyAuthenticator =>
 
-  case class IssueForm(title: String, content: Option[String])
+  case class IssueCreateForm(title: String, content: Option[String],
+    assignedUserName: Option[String], milestoneId: Option[Int], labelNames: Option[String])
+
+  case class IssueEditForm(title: String, content: Option[String])
+
   case class CommentForm(issueId: Int, content: String)
 
-  val form = mapping(
+  val issueCreateForm = mapping(
+      "title"            -> trim(label("Title", text(required))),
+      "content"          -> trim(optional(text())),
+      "assignedUserName" -> trim(optional(text())),
+      "milestoneId"      -> trim(optional(number())),
+      "labelNames"       -> trim(optional(text()))
+    )(IssueCreateForm.apply)
+
+  val issueEditForm = mapping(
       "title"   -> trim(label("Title", text(required))),
       "content" -> trim(optional(text()))
-    )(IssueForm.apply)
+    )(IssueEditForm.apply)
+
   val commentForm = mapping(
       "issueId" -> label("Issue Id", number()),
       "content" -> trim(label("Comment", text(required)))
@@ -63,16 +76,29 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   // TODO requires users only and readable repository checking
-  post("/:owner/:repository/issues/new", form)( usersOnly { form =>
+  post("/:owner/:repository/issues/new", issueCreateForm)( usersOnly { form =>
     val owner = params("owner")
     val repository = params("repository")
 
-    redirect("/%s/%s/issues/%d".format(owner, repository,
-        createIssue(owner, repository, context.loginAccount.get.userName, form.title, form.content)))
+    // TODO User and milestone are assigned by only collaborators.
+    val issueId = createIssue(owner, repository, context.loginAccount.get.userName,
+      form.title, form.content, form.assignedUserName, form.milestoneId)
+
+    // TODO labels are assigned by only collaborators
+    form.labelNames.map { value =>
+      val labels = getLabels(owner, repository)
+      value.split(",").foreach { labelName =>
+        labels.find(_.labelName == labelName).map { label =>
+          registerIssueLabel(owner, repository, issueId, label.labelId)
+        }
+      }
+    }
+
+    redirect("/%s/%s/issues/%d".format(owner, repository, issueId))
   })
 
   // TODO Authenticator
-  ajaxPost("/:owner/:repository/issues/edit/:id", form){ form =>
+  ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm){ form =>
     val owner = params("owner")
     val repository = params("repository")
     val issueId = params("id").toInt

src/main/scala/service/IssuesService.scala

@@ -173,6 +173,9 @@ trait IssuesService {
   def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int): Unit =
     IssueLabels.* insert (IssueLabel(owner, repository, issueId, labelId))
 
+  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int): Unit =
+    IssueLabels.* insert (IssueLabel(owner, repository, issueId, labelId))
+
   def createComment(owner: String, repository: String, loginUser: String,
       issueId: Int, content: String, action: Option[String]) =
     IssueComments.autoInc insert (

src/main/twirl/issues/create.scala.html

@@ -4,10 +4,9 @@
 @html.main("New Issue - " + repository.owner + "/" + repository.name){
   @html.header("issues", repository)
   @tab("", repository)
-
+  <form action="@url(repository)/issues/new" method="POST" validate="true">
   <div class="row-fluid">
     <div class="span9">
-      <form action="@url(repository)/issues/new" method="POST" validate="true">
       <div class="box">
         <div class="box-content">
           <span id="error-title" class="error"></span>
@@ -51,7 +50,6 @@
         </div>
       </div>
       <input type="submit" class="btn btn-success" value="Submit new issue"/>
-      </form>
     </div>
     <div class="span3">
       <strong>Add Labels</strong>
@@ -72,6 +70,7 @@
       </div>
     </div>
   </div>
+  </form>
 }
 <script>
 $(function(){

src/main/twirl/issues/list.scala.html

@@ -131,7 +131,7 @@
           <td>
             <a href="@url(repository)/issues/@issue.issueId" class="issue-title">@issue.title</a>
             @labels.map { label =>
-              <span class="label-color" style="background-color: #@label.color; color: #@label.fontColor;">@label.labelName</span>
+              <span class="label-color small" style="background-color: #@label.color; color: #@label.fontColor; padding-left: 4px; padding-right: 4px">@label.labelName</span>
             }
             <span class="pull-right muted">#@issue.issueId</span>
             <div class="small muted">