diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index 5847f70..ebeac25 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -53,8 +53,12 @@ // 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 4d1e4f2..8864556 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 @@
- @* - - *@ +
+ +
@html.preview(repository, "", false, true, true, "width: 650px; height: 200px;") @@ -46,7 +54,30 @@
- TODO Add Labels + Add Labels +
} +