From 2aa1edbf23d7e23b9e745151f00dd7cfb448407b Mon Sep 17 00:00:00 2001
From: takezoe <takezoe@gmail.com>
Date: Tue, 2 Jul 2013 01:53:54 +0900
Subject: [PATCH] Add assignee and milestone to the new issue form.

---
 src/main/scala/app/IssuesController.scala |  8 ++-
 src/main/twirl/issues/create.scala.html   | 73 ++++++++++++++++-------
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala
index 5847f705f..ebeac25bd 100644
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -53,8 +53,12 @@ trait IssuesControllerBase extends ControllerBase {
 
   // TODO requires users only and readable repository checking
   get("/:owner/:repository/issues/new")( usersOnly {
-    getRepository(params("owner"), params("repository"), baseUrl)
-      .map (issues.html.create(_))
+    val owner      = params("owner")
+    val repository = params("repository")
+
+    getRepository(owner, repository, baseUrl)
+      .map (issues.html.create((getCollaborators(owner, repository) :+ owner).sorted,
+                               getMilestones(owner, repository), getLabels(owner, repository), _))
       .getOrElse (NotFound)
   })
 
diff --git a/src/main/twirl/issues/create.scala.html b/src/main/twirl/issues/create.scala.html
index 4d1e4f274..8864556f8 100644
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -1,4 +1,4 @@
-@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(collaborators: List[String], milestones: List[model.Milestone], labels: List[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main("New Issue - " + repository.owner + "/" + repository.name){
@@ -12,33 +12,41 @@
         <div class="box-content">
           <span id="error-title" class="error"></span>
           <input type="text" name="title" value="" placeholder="Title" style="width: 650px;"/>
-          @*
-          <ul class="nav nav-tabs">
-            <li class="pull-left">No one is assigned
+          <div>
+            <span id="label-assigned">No one is assigned</span>
+            <input type="hidden" name="assignedUserName" value=""/>
+            <div class="btn-group">
+              <button class="btn dropdown-toggle" data-toggle="dropdown">
+                <i class="icon-cog"></i>
+                <span class="caret"></span>
+              </button>
+              <ul class="dropdown-menu">
+                <li><a href="javascript:void(0);" id="clear-assignee">Clear assignee</a></li>
+                <li class="divider"></li>
+                @collaborators.map { collaborator =>
+                  <li><a href="javascript:void(0);" class="assign">@collaborator</a></li>
+                }
+              </ul>
+            </div>
+            <div class="pull-right">
+              <span id="label-milestone">No milestone</span>
+              <input type="hidden" name="milestoneId" value=""/>
               <div class="btn-group">
-                <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
-                  <i class="icon-cog"></i>
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a href="#">takezoe</a></li>
-                  <li><a href="#">shimamoto</a></li>
-                </ul>
-              </div>
-            </li>
-            <li class="pull-right">No milestone
-              <div class="btn-group">
-                <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+                <button class="btn dropdown-toggle" data-toggle="dropdown">
                   <i class="icon-cog"></i>
                   <span class="caret"></span>
                 </button>
                 <ul class="dropdown-menu">
+                  <li><a href="javascript:void(0);" class="milestone" data-id="">No milestone</a></li>
                   <li class="divider"></li>
+                  @milestones.map { milestone =>
+                    <li><a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId">@milestone.title</a></li>
+                  }
                 </ul>
               </div>
-            </li>
-          </ul>
-          *@
+            </div>
+          </div>
+          <hr>
           @html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
         </div>
       </div>
@@ -46,7 +54,30 @@
       </form>
     </div>
     <div class="span3">
-      TODO Add Labels
+      <strong>Add Labels</strong>
+      <ul>
+        @labels.map { label =>
+          <li>@label.labelName</li>
+        }
+      </ul>
     </div>
   </div>
 }
+<script>
+$(function(){
+  $('a.assign').click(function(){
+    $('#label-assigned').html($(this).text() + ' well be assigned');
+    $('input[name=assignedUserName]').val($(this).text());
+  });
+
+  $('a#clear-assignee').click(function(){
+    $('#label-assigned').text('No one will be assigned');
+    $('input[name=assignedUserName]').val('');
+  });
+
+  $('a.milestone').click(function(){
+    $('#label-milestone').text($(this).text());
+    $('input[name=milestoneId]').val($(this).data('id'));
+  });
+});
+</script>