Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 15:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add all, assigned and created_by issue count.

Browse Source
This commit is contained in:
takezoe
2013-06-26 10:04:33 +09:00
parent 946b144a1b
commit 8283302c18
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/scala/app/IssuesController.scala
View File

@@ -93,6 +93,9 @@ trait IssuesControllerBase extends ControllerBase {
getMilestones(owner, repository).filter(_.closedDate.isEmpty), getMilestones(owner, repository).filter(_.closedDate.isEmpty),
countIssue(owner, repository, condition.copy(state = "open"), filter, userName), countIssue(owner, repository, condition.copy(state = "open"), filter, userName),
countIssue(owner, repository, condition.copy(state = "closed"), filter, userName), countIssue(owner, repository, condition.copy(state = "closed"), filter, userName),
countIssue(owner, repository, condition, "all", None),
context.loginAccount.map(x => countIssue(owner, repository, condition, "assigned", Some(x.userName))),
context.loginAccount.map(x => countIssue(owner, repository, condition, "created_by", Some(x.userName))),
condition, filter, repositoryInfo, isWritable(owner, repository, context.loginAccount)) condition, filter, repositoryInfo, isWritable(owner, repository, context.loginAccount))
} getOrElse NotFound } getOrElse NotFound

8
src/main/twirl/issues/issues.scala.html
View File

@@ -1,5 +1,5 @@
@(issues: List[model.Issue], labels: List[model.Label], milestones: List[model.Milestone], @(issues: List[model.Issue], labels: List[model.Label], milestones: List[model.Milestone],
openCount: Int, closedCount: Int, openCount: Int, closedCount: Int, allCount: Int, assignedCount: Option[Int], createdByCount: Option[Int],
condition: service.IssuesService.IssueSearchCondition, filter: String, condition: service.IssuesService.IssueSearchCondition, filter: String,
repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context) repository: service.RepositoryService.RepositoryInfo, isWritable: Boolean)(implicit context: app.Context)
@import context._ @import context._
@@ -12,20 +12,20 @@
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<li@if(filter == "all"){ class="active"}> <li@if(filter == "all"){ class="active"}>
<a href="@path/@repository.owner/@repository.name/issues@condition.toURL"> <a href="@path/@repository.owner/@repository.name/issues@condition.toURL">
<span class="count-right">0</span> <span class="count-right">@allCount</span>
Everyone's Issues Everyone's Issues
</a> </a>
</li> </li>
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<li@if(filter == "assigned"){ class="active"}> <li@if(filter == "assigned"){ class="active"}>
<a href="@path/@repository.owner/@repository.name/issues/assigned/@loginAccount.map(_.userName)@condition.toURL"> <a href="@path/@repository.owner/@repository.name/issues/assigned/@loginAccount.map(_.userName)@condition.toURL">
<span class="count-right">0</span> <span class="count-right">@assignedCount</span>
Assigned to you Assigned to you
</a> </a>
</li> </li>
<li@if(filter == "created_by"){ class="active"}> <li@if(filter == "created_by"){ class="active"}>
<a href="@path/@repository.owner/@repository.name/issues/created_by/@loginAccount.map(_.userName)@condition.toURL"> <a href="@path/@repository.owner/@repository.name/issues/created_by/@loginAccount.map(_.userName)@condition.toURL">
<span class="count-right">0</span> <span class="count-right">@createdByCount</span>
Created by you Created by you
</a> </a>
</li> </li>