mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-03 20:15:59 +01:00
Add assignee and milestone to the new issue form.
This commit is contained in:
@@ -53,8 +53,12 @@ trait IssuesControllerBase extends ControllerBase {
|
|||||||
|
|
||||||
// TODO requires users only and readable repository checking
|
// TODO requires users only and readable repository checking
|
||||||
get("/:owner/:repository/issues/new")( usersOnly {
|
get("/:owner/:repository/issues/new")( usersOnly {
|
||||||
getRepository(params("owner"), params("repository"), baseUrl)
|
val owner = params("owner")
|
||||||
.map (issues.html.create(_))
|
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)
|
.getOrElse (NotFound)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -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 context._
|
||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
@html.main("New Issue - " + repository.owner + "/" + repository.name){
|
@html.main("New Issue - " + repository.owner + "/" + repository.name){
|
||||||
@@ -12,33 +12,41 @@
|
|||||||
<div class="box-content">
|
<div class="box-content">
|
||||||
<span id="error-title" class="error"></span>
|
<span id="error-title" class="error"></span>
|
||||||
<input type="text" name="title" value="" placeholder="Title" style="width: 650px;"/>
|
<input type="text" name="title" value="" placeholder="Title" style="width: 650px;"/>
|
||||||
@*
|
<div>
|
||||||
<ul class="nav nav-tabs">
|
<span id="label-assigned">No one is assigned</span>
|
||||||
<li class="pull-left">No one is assigned
|
<input type="hidden" name="assignedUserName" value=""/>
|
||||||
<div class="btn-group">
|
<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="#">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">
|
|
||||||
<i class="icon-cog"></i>
|
<i class="icon-cog"></i>
|
||||||
<span class="caret"></span>
|
<span class="caret"></span>
|
||||||
</button>
|
</button>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
|
<li><a href="javascript:void(0);" id="clear-assignee">Clear assignee</a></li>
|
||||||
<li class="divider"></li>
|
<li class="divider"></li>
|
||||||
|
@collaborators.map { collaborator =>
|
||||||
|
<li><a href="javascript:void(0);" class="assign">@collaborator</a></li>
|
||||||
|
}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
<div class="pull-right">
|
||||||
|
<span id="label-milestone">No milestone</span>
|
||||||
|
<input type="hidden" name="milestoneId" 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);" 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>
|
</ul>
|
||||||
*@
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
@html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
|
@html.preview(repository, "", false, true, true, "width: 650px; height: 200px;")
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -46,7 +54,30 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="span3">
|
<div class="span3">
|
||||||
TODO Add Labels
|
<strong>Add Labels</strong>
|
||||||
|
<ul>
|
||||||
|
@labels.map { label =>
|
||||||
|
<li>@label.labelName</li>
|
||||||
|
}
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
|
|||||||
Reference in New Issue
Block a user