mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-09 06:55:54 +01:00
Fix pull request's view on dashboard
This commit is contained in:
@@ -29,21 +29,25 @@ trait DashboardControllerBase extends ControllerBase {
|
|||||||
})
|
})
|
||||||
|
|
||||||
get("/dashboard/pulls")(usersOnly {
|
get("/dashboard/pulls")(usersOnly {
|
||||||
|
searchPullRequests("all", None)
|
||||||
|
})
|
||||||
|
|
||||||
|
get("/dashboard/pulls/all")(usersOnly {
|
||||||
|
searchPullRequests("all", None)
|
||||||
|
})
|
||||||
|
|
||||||
|
get("/dashboard/pulls/created_by")(usersOnly {
|
||||||
searchPullRequests("created_by", None)
|
searchPullRequests("created_by", None)
|
||||||
})
|
})
|
||||||
|
|
||||||
get("/dashboard/pulls/owned")(usersOnly {
|
get("/dashboard/pulls/assigned")(usersOnly {
|
||||||
searchPullRequests("created_by", None)
|
searchPullRequests("assigned", None)
|
||||||
})
|
})
|
||||||
|
|
||||||
get("/dashboard/pulls/mentioned")(usersOnly {
|
get("/dashboard/pulls/mentioned")(usersOnly {
|
||||||
searchPullRequests("mentioned", None)
|
searchPullRequests("mentioned", None)
|
||||||
})
|
})
|
||||||
|
|
||||||
get("/dashboard/pulls/public")(usersOnly {
|
|
||||||
searchPullRequests("not_created_by", None)
|
|
||||||
})
|
|
||||||
|
|
||||||
get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
|
get("/dashboard/pulls/for/:owner/:repository")(usersOnly {
|
||||||
searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
|
searchPullRequests("all", Some(params("owner") + "/" + params("repository")))
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -10,6 +10,6 @@
|
|||||||
@html.main("Pull Requests"){
|
@html.main("Pull Requests"){
|
||||||
@dashboard.html.tab("pulls")
|
@dashboard.html.tab("pulls")
|
||||||
<div class="container">
|
<div class="container">
|
||||||
@issueslist(issues, page, openCount, closedCount, condition, filter, groups)
|
@pullslist(issues, page, openCount, closedCount, condition, filter, groups)
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,8 @@
|
|||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
@import service.IssuesService.IssueInfo
|
@import service.IssuesService.IssueInfo
|
||||||
<ul class="nav nav-pills-group pull-left fill-width">
|
<ul class="nav nav-pills-group pull-left fill-width">
|
||||||
<li class="@if(filter == "created_by"){active} first"><a href="@path/dashboard/pulls/created_by@condition.toURL">Created</a></li>
|
<li class="@if(filter == "all"){active} first"><a href="@path/dashboard/pulls/all@condition.toURL">All</a></li>
|
||||||
|
<li class="@if(filter == "created_by"){active}"><a href="@path/dashboard/pulls/created_by@condition.toURL">Created</a></li>
|
||||||
<li class="@if(filter == "assigned"){active}"><a href="@path/dashboard/pulls/assigned@condition.toURL">Assigned</a></li>
|
<li class="@if(filter == "assigned"){active}"><a href="@path/dashboard/pulls/assigned@condition.toURL">Assigned</a></li>
|
||||||
<li class="@if(filter == "mentioned"){active} last"><a href="@path/dashboard/pulls/mentioned@condition.toURL">Mentioned</a></li>
|
<li class="@if(filter == "mentioned"){active} last"><a href="@path/dashboard/pulls/mentioned@condition.toURL">Mentioned</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
Reference in New Issue
Block a user