* Make repository list @ issues/PR page persist Will partially fix #6355 * Enable multiple selections in repo list @ issues/PR page Part of issue #6355 * Add RepoIDs to UserIssueStatsOptions to make "type" count correct when selecting one/multiple repos. * Replace variable "repo" with list "repos[]" and enable multiple selections of repositories from list by including/excluding RepoIDs in list. * * Remove redundant code * Add 'All' button Improves functionality of the page, so that backtracking is not necessary to reset the page * Remove redundant variable Completely replace 'RepoID' with 'RepoIDs' and remove redundant code * Add RepoIDs to label link * Revert part of code to previous version to troubleshoot build failure * Implement old and new pieces of code whilst adhering to multi select * Attempt to join the two versions Last commit passed tests but doesn't work in practice, this works in practice and hopefully passes the tests. * Update tests to desired state * Fix pagination implementation and tests * Pass repoIDs as `repos=[1,2,3...]` instead of several `repos[]=..` * Update tests file to reflect new functionality * Update template with new `repos` format * Implement new solution to show constant "total issues" count for "All" button * Correct behavior when passing zero to array * Comment out test url returning 404 This keeps returning 404 in the test despite working in practice, for the sake of running more tests I am commenting it out * Comment out another test url returning 404 Last attempt, if more tests crash I will uncomment the urls and request assistance. * Reenable tests and test fix * Re-enable tests * Make selecting "In your repositories" reset selection as passing IDs of repos belonging to other profiles causes breakage * Remove unnecessary (with multi-selection enable) code * Drop repo from repo map and total count if permission denied * Remove extra parenthesis * make template work again * find bug! * forgot the '#' at bugfixing * delete unused RepoID * compile regex only one time * make fmt * local variable = capital letter lower * check if repos query pattern is correct * pagination remove last , - make regex work again * use Replace instead of ReplaceAll; del delete * fix test * how did this test binary got in?!? dont forgot the "-p" at git add * ! * dont replace -> cut fisrt & last string Co-Authored-By: zeripath <art27@cantab.net> * jet another regex dont mind as long as it has the same result and is performatn ... Co-Authored-By: zeripath <art27@cantab.net> * dont use nonexisting repo for test * exclude /issues?type=created_by from test * add table to querys use same syntax in each query (table.colum) * add new issue for test * dont make a workaround or something else this need a refactor itself and is out of scope for this PR * fix misspell * CI.redo() * englisch txt update Co-Authored-By: zeripath <art27@cantab.net> * add sugestions * Tweak & Fix * CI.restart()tags/v1.11.0-rc1
@@ -72,19 +72,20 @@ func testLinksAsUser(userName string, t *testing.T) { | |||||
"/api/swagger", | "/api/swagger", | ||||
"/api/v1/swagger", | "/api/v1/swagger", | ||||
"/issues", | "/issues", | ||||
"/issues?type=your_repositories&repo=0&sort=&state=open", | |||||
"/issues?type=assigned&repo=0&sort=&state=open", | |||||
"/issues?type=created_by&repo=0&sort=&state=open", | |||||
"/issues?type=your_repositories&repo=0&sort=&state=closed", | |||||
"/issues?type=assigned&repo=0&sort=&state=closed", | |||||
"/issues?type=created_by&repo=0&sort=&state=closed", | |||||
"/issues?type=your_repositories&repos=[0]&sort=&state=open", | |||||
"/issues?type=assigned&repos=[0]&sort=&state=open", | |||||
"/issues?type=your_repositories&repos=[0]&sort=&state=closed", | |||||
"/issues?type=assigned&repos=[]&sort=&state=closed", | |||||
"/issues?type=assigned&sort=&state=open", | |||||
"/issues?type=created_by&repos=[1,2]&sort=&state=closed", | |||||
"/issues?type=created_by&repos=[1,2]&sort=&state=open", | |||||
"/pulls", | "/pulls", | ||||
"/pulls?type=your_repositories&repo=0&sort=&state=open", | |||||
"/pulls?type=assigned&repo=0&sort=&state=open", | |||||
"/pulls?type=created_by&repo=0&sort=&state=open", | |||||
"/pulls?type=your_repositories&repo=0&sort=&state=closed", | |||||
"/pulls?type=assigned&repo=0&sort=&state=closed", | |||||
"/pulls?type=created_by&repo=0&sort=&state=closed", | |||||
"/pulls?type=your_repositories&repos=[2]&sort=&state=open", | |||||
"/pulls?type=assigned&repos=[]&sort=&state=open", | |||||
"/pulls?type=created_by&repos=[0]&sort=&state=open", | |||||
"/pulls?type=your_repositories&repos=[0]&sort=&state=closed", | |||||
"/pulls?type=assigned&repos=[0]&sort=&state=closed", | |||||
"/pulls?type=created_by&repos=[0]&sort=&state=closed", | |||||
"/notifications", | "/notifications", | ||||
"/repo/create", | "/repo/create", | ||||
"/repo/migrate", | "/repo/migrate", | ||||
@@ -96,4 +96,4 @@ | |||||
is_closed: false | is_closed: false | ||||
is_pull: true | is_pull: true | ||||
created_unix: 946684820 | created_unix: 946684820 | ||||
updated_unix: 978307180 | |||||
updated_unix: 978307180 |
@@ -6,3 +6,7 @@ | |||||
id: 2 | id: 2 | ||||
assignee_id: 1 | assignee_id: 1 | ||||
issue_id: 6 | issue_id: 6 | ||||
- | |||||
id: 3 | |||||
assignee_id: 2 | |||||
issue_id: 6 |
@@ -1402,7 +1402,7 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) { | |||||
// UserIssueStatsOptions contains parameters accepted by GetUserIssueStats. | // UserIssueStatsOptions contains parameters accepted by GetUserIssueStats. | ||||
type UserIssueStatsOptions struct { | type UserIssueStatsOptions struct { | ||||
UserID int64 | UserID int64 | ||||
RepoID int64 | |||||
RepoIDs []int64 | |||||
UserRepoIDs []int64 | UserRepoIDs []int64 | ||||
FilterMode int | FilterMode int | ||||
IsPull bool | IsPull bool | ||||
@@ -1416,19 +1416,19 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) { | |||||
cond := builder.NewCond() | cond := builder.NewCond() | ||||
cond = cond.And(builder.Eq{"issue.is_pull": opts.IsPull}) | cond = cond.And(builder.Eq{"issue.is_pull": opts.IsPull}) | ||||
if opts.RepoID > 0 { | |||||
cond = cond.And(builder.Eq{"issue.repo_id": opts.RepoID}) | |||||
if len(opts.RepoIDs) > 0 { | |||||
cond = cond.And(builder.In("issue.repo_id", opts.RepoIDs)) | |||||
} | } | ||||
switch opts.FilterMode { | switch opts.FilterMode { | ||||
case FilterModeAll: | case FilterModeAll: | ||||
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false). | |||||
stats.OpenCount, err = x.Where(cond).And("issue.is_closed = ?", false). | |||||
And(builder.In("issue.repo_id", opts.UserRepoIDs)). | And(builder.In("issue.repo_id", opts.UserRepoIDs)). | ||||
Count(new(Issue)) | Count(new(Issue)) | ||||
if err != nil { | if err != nil { | ||||
return nil, err | return nil, err | ||||
} | } | ||||
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true). | |||||
stats.ClosedCount, err = x.Where(cond).And("issue.is_closed = ?", true). | |||||
And(builder.In("issue.repo_id", opts.UserRepoIDs)). | And(builder.In("issue.repo_id", opts.UserRepoIDs)). | ||||
Count(new(Issue)) | Count(new(Issue)) | ||||
if err != nil { | if err != nil { | ||||
@@ -1450,14 +1450,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) { | |||||
return nil, err | return nil, err | ||||
} | } | ||||
case FilterModeCreate: | case FilterModeCreate: | ||||
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false). | |||||
And("poster_id = ?", opts.UserID). | |||||
stats.OpenCount, err = x.Where(cond).And("issue.is_closed = ?", false). | |||||
And("issue.poster_id = ?", opts.UserID). | |||||
Count(new(Issue)) | Count(new(Issue)) | ||||
if err != nil { | if err != nil { | ||||
return nil, err | return nil, err | ||||
} | } | ||||
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true). | |||||
And("poster_id = ?", opts.UserID). | |||||
stats.ClosedCount, err = x.Where(cond).And("issue.is_closed = ?", true). | |||||
And("issue.poster_id = ?", opts.UserID). | |||||
Count(new(Issue)) | Count(new(Issue)) | ||||
if err != nil { | if err != nil { | ||||
return nil, err | return nil, err | ||||
@@ -180,7 +180,7 @@ func TestGetUserIssueStats(t *testing.T) { | |||||
{ | { | ||||
UserIssueStatsOptions{ | UserIssueStatsOptions{ | ||||
UserID: 1, | UserID: 1, | ||||
RepoID: 1, | |||||
RepoIDs: []int64{1}, | |||||
FilterMode: FilterModeAll, | FilterMode: FilterModeAll, | ||||
}, | }, | ||||
IssueStats{ | IssueStats{ | ||||
@@ -7,8 +7,11 @@ package user | |||||
import ( | import ( | ||||
"bytes" | "bytes" | ||||
"encoding/json" | |||||
"fmt" | "fmt" | ||||
"regexp" | |||||
"sort" | "sort" | ||||
"strconv" | |||||
"strings" | "strings" | ||||
"code.gitea.io/gitea/models" | "code.gitea.io/gitea/models" | ||||
@@ -20,7 +23,6 @@ import ( | |||||
"github.com/keybase/go-crypto/openpgp" | "github.com/keybase/go-crypto/openpgp" | ||||
"github.com/keybase/go-crypto/openpgp/armor" | "github.com/keybase/go-crypto/openpgp/armor" | ||||
"github.com/unknwon/com" | |||||
) | ) | ||||
const ( | const ( | ||||
@@ -149,6 +151,9 @@ func Dashboard(ctx *context.Context) { | |||||
ctx.HTML(200, tplDashboard) | ctx.HTML(200, tplDashboard) | ||||
} | } | ||||
// Regexp for repos query | |||||
var issueReposQueryPattern = regexp.MustCompile(`^\[\d+(,\d+)*,?\]$`) | |||||
// Issues render the user issues page | // Issues render the user issues page | ||||
func Issues(ctx *context.Context) { | func Issues(ctx *context.Context) { | ||||
isPullList := ctx.Params(":type") == "pulls" | isPullList := ctx.Params(":type") == "pulls" | ||||
@@ -194,7 +199,25 @@ func Issues(ctx *context.Context) { | |||||
page = 1 | page = 1 | ||||
} | } | ||||
repoID := ctx.QueryInt64("repo") | |||||
reposQuery := ctx.Query("repos") | |||||
var repoIDs []int64 | |||||
if issueReposQueryPattern.MatchString(reposQuery) { | |||||
// remove "[" and "]" from string | |||||
reposQuery = reposQuery[1 : len(reposQuery)-1] | |||||
//for each ID (delimiter ",") add to int to repoIDs | |||||
for _, rID := range strings.Split(reposQuery, ",") { | |||||
// Ensure nonempty string entries | |||||
if rID != "" && rID != "0" { | |||||
rIDint64, err := strconv.ParseInt(rID, 10, 64) | |||||
if err == nil { | |||||
repoIDs = append(repoIDs, rIDint64) | |||||
} | |||||
} | |||||
} | |||||
} else { | |||||
log.Error("issueReposQueryPattern not match with query") | |||||
} | |||||
isShowClosed := ctx.Query("state") == "closed" | isShowClosed := ctx.Query("state") == "closed" | ||||
// Get repositories. | // Get repositories. | ||||
@@ -232,20 +255,9 @@ func Issues(ctx *context.Context) { | |||||
SortType: sortType, | SortType: sortType, | ||||
} | } | ||||
if repoID > 0 { | |||||
opts.RepoIDs = []int64{repoID} | |||||
} | |||||
switch filterMode { | switch filterMode { | ||||
case models.FilterModeAll: | case models.FilterModeAll: | ||||
if repoID > 0 { | |||||
if !com.IsSliceContainsInt64(userRepoIDs, repoID) { | |||||
// force an empty result | |||||
opts.RepoIDs = []int64{-1} | |||||
} | |||||
} else { | |||||
opts.RepoIDs = userRepoIDs | |||||
} | |||||
opts.RepoIDs = userRepoIDs | |||||
case models.FilterModeAssign: | case models.FilterModeAssign: | ||||
opts.AssigneeID = ctxUser.ID | opts.AssigneeID = ctxUser.ID | ||||
case models.FilterModeCreate: | case models.FilterModeCreate: | ||||
@@ -273,6 +285,8 @@ func Issues(ctx *context.Context) { | |||||
} | } | ||||
opts.LabelIDs = labelIDs | opts.LabelIDs = labelIDs | ||||
opts.RepoIDs = repoIDs | |||||
issues, err := models.Issues(opts) | issues, err := models.Issues(opts) | ||||
if err != nil { | if err != nil { | ||||
ctx.ServerError("Issues", err) | ctx.ServerError("Issues", err) | ||||
@@ -281,46 +295,23 @@ func Issues(ctx *context.Context) { | |||||
showReposMap := make(map[int64]*models.Repository, len(counts)) | showReposMap := make(map[int64]*models.Repository, len(counts)) | ||||
for repoID := range counts { | for repoID := range counts { | ||||
repo, err := models.GetRepositoryByID(repoID) | |||||
if err != nil { | |||||
ctx.ServerError("GetRepositoryByID", err) | |||||
showReposMap[repoID], err = models.GetRepositoryByID(repoID) | |||||
if models.IsErrRepoNotExist(err) { | |||||
ctx.NotFound("GetRepositoryByID", err) | |||||
return | |||||
} else if err != nil { | |||||
ctx.ServerError("GetRepositoryByID", fmt.Errorf("[%d]%v", repoID, err)) | |||||
return | return | ||||
} | |||||
showReposMap[repoID] = repo | |||||
} | |||||
if repoID > 0 { | |||||
if _, ok := showReposMap[repoID]; !ok { | |||||
repo, err := models.GetRepositoryByID(repoID) | |||||
if models.IsErrRepoNotExist(err) { | |||||
ctx.NotFound("GetRepositoryByID", err) | |||||
return | |||||
} else if err != nil { | |||||
ctx.ServerError("GetRepositoryByID", fmt.Errorf("[%d]%v", repoID, err)) | |||||
return | |||||
} | |||||
showReposMap[repoID] = repo | |||||
} | } | ||||
repo := showReposMap[repoID] | |||||
// Check if user has access to given repository. | // Check if user has access to given repository. | ||||
perm, err := models.GetUserRepoPermission(repo, ctxUser) | |||||
perm, err := models.GetUserRepoPermission(showReposMap[repoID], ctxUser) | |||||
if err != nil { | if err != nil { | ||||
ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", repoID, err)) | ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", repoID, err)) | ||||
return | return | ||||
} | } | ||||
if !perm.CanRead(models.UnitTypeIssues) { | if !perm.CanRead(models.UnitTypeIssues) { | ||||
if log.IsTrace() { | |||||
log.Trace("Permission Denied: User %-v cannot read %-v of repo %-v\n"+ | |||||
"User in repo has Permissions: %-+v", | |||||
ctxUser, | |||||
models.UnitTypeIssues, | |||||
repo, | |||||
perm) | |||||
} | |||||
ctx.Status(404) | |||||
return | |||||
log.Error("User created Issues in Repository which they no longer have access to: [%d]", repoID) | |||||
} | } | ||||
} | } | ||||
@@ -342,7 +333,6 @@ func Issues(ctx *context.Context) { | |||||
issueStats, err := models.GetUserIssueStats(models.UserIssueStatsOptions{ | issueStats, err := models.GetUserIssueStats(models.UserIssueStatsOptions{ | ||||
UserID: ctxUser.ID, | UserID: ctxUser.ID, | ||||
RepoID: repoID, | |||||
UserRepoIDs: userRepoIDs, | UserRepoIDs: userRepoIDs, | ||||
FilterMode: filterMode, | FilterMode: filterMode, | ||||
IsPull: isPullList, | IsPull: isPullList, | ||||
@@ -353,11 +343,26 @@ func Issues(ctx *context.Context) { | |||||
return | return | ||||
} | } | ||||
var total int | |||||
allIssueStats, err := models.GetUserIssueStats(models.UserIssueStatsOptions{ | |||||
UserID: ctxUser.ID, | |||||
UserRepoIDs: userRepoIDs, | |||||
FilterMode: filterMode, | |||||
IsPull: isPullList, | |||||
IsClosed: isShowClosed, | |||||
}) | |||||
if err != nil { | |||||
ctx.ServerError("GetUserIssueStats All", err) | |||||
return | |||||
} | |||||
var shownIssues int | |||||
var totalIssues int | |||||
if !isShowClosed { | if !isShowClosed { | ||||
total = int(issueStats.OpenCount) | |||||
shownIssues = int(issueStats.OpenCount) | |||||
totalIssues = int(allIssueStats.OpenCount) | |||||
} else { | } else { | ||||
total = int(issueStats.ClosedCount) | |||||
shownIssues = int(issueStats.ClosedCount) | |||||
totalIssues = int(allIssueStats.ClosedCount) | |||||
} | } | ||||
ctx.Data["Issues"] = issues | ctx.Data["Issues"] = issues | ||||
@@ -367,8 +372,9 @@ func Issues(ctx *context.Context) { | |||||
ctx.Data["IssueStats"] = issueStats | ctx.Data["IssueStats"] = issueStats | ||||
ctx.Data["ViewType"] = viewType | ctx.Data["ViewType"] = viewType | ||||
ctx.Data["SortType"] = sortType | ctx.Data["SortType"] = sortType | ||||
ctx.Data["RepoID"] = repoID | |||||
ctx.Data["RepoIDs"] = repoIDs | |||||
ctx.Data["IsShowClosed"] = isShowClosed | ctx.Data["IsShowClosed"] = isShowClosed | ||||
ctx.Data["TotalIssueCount"] = totalIssues | |||||
if isShowClosed { | if isShowClosed { | ||||
ctx.Data["State"] = "closed" | ctx.Data["State"] = "closed" | ||||
@@ -376,9 +382,14 @@ func Issues(ctx *context.Context) { | |||||
ctx.Data["State"] = "open" | ctx.Data["State"] = "open" | ||||
} | } | ||||
pager := context.NewPagination(total, setting.UI.IssuePagingNum, page, 5) | |||||
// Convert []int64 to string | |||||
reposParam, _ := json.Marshal(repoIDs) | |||||
ctx.Data["ReposParam"] = string(reposParam) | |||||
pager := context.NewPagination(shownIssues, setting.UI.IssuePagingNum, page, 5) | |||||
pager.AddParam(ctx, "type", "ViewType") | pager.AddParam(ctx, "type", "ViewType") | ||||
pager.AddParam(ctx, "repo", "RepoID") | |||||
pager.AddParam(ctx, "repos", "ReposParam") | |||||
pager.AddParam(ctx, "sort", "SortType") | pager.AddParam(ctx, "sort", "SortType") | ||||
pager.AddParam(ctx, "state", "State") | pager.AddParam(ctx, "state", "State") | ||||
pager.AddParam(ctx, "labels", "SelectLabels") | pager.AddParam(ctx, "labels", "SelectLabels") | ||||
@@ -5,40 +5,59 @@ | |||||
<div class="ui stackable grid"> | <div class="ui stackable grid"> | ||||
<div class="four wide column"> | <div class="four wide column"> | ||||
<div class="ui secondary vertical filter menu"> | <div class="ui secondary vertical filter menu"> | ||||
<a class="{{if eq .ViewType "your_repositories"}}ui basic blue button{{end}} item" href="{{.Link}}?type=your_repositories&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}"> | |||||
<a class="{{if eq .ViewType "your_repositories"}}ui basic blue button{{end}} item" href="{{.Link}}?type=your_repositories&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}"> | |||||
{{.i18n.Tr "home.issues.in_your_repos"}} | {{.i18n.Tr "home.issues.in_your_repos"}} | ||||
<strong class="ui right">{{.IssueStats.YourRepositoriesCount}}</strong> | <strong class="ui right">{{.IssueStats.YourRepositoriesCount}}</strong> | ||||
</a> | </a> | ||||
{{if not .ContextUser.IsOrganization}} | {{if not .ContextUser.IsOrganization}} | ||||
<a class="{{if eq .ViewType "assigned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=assigned&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}"> | |||||
<a class="{{if eq .ViewType "assigned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=assigned&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}"> | |||||
{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} | {{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}} | ||||
<strong class="ui right">{{.IssueStats.AssignCount}}</strong> | <strong class="ui right">{{.IssueStats.AssignCount}}</strong> | ||||
</a> | </a> | ||||
<a class="{{if eq .ViewType "created_by"}}ui basic blue button{{end}} item" href="{{.Link}}?type=created_by&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}"> | |||||
<a class="{{if eq .ViewType "created_by"}}ui basic blue button{{end}} item" href="{{.Link}}?type=created_by&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}"> | |||||
{{.i18n.Tr "repo.issues.filter_type.created_by_you"}} | {{.i18n.Tr "repo.issues.filter_type.created_by_you"}} | ||||
<strong class="ui right">{{.IssueStats.CreateCount}}</strong> | <strong class="ui right">{{.IssueStats.CreateCount}}</strong> | ||||
</a> | </a> | ||||
<a class="{{if eq .ViewType "mentioned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=mentioned&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}"> | |||||
<a class="{{if eq .ViewType "mentioned"}}ui basic blue button{{end}} item" href="{{.Link}}?type=mentioned&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state={{.State}}"> | |||||
{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}} | {{.i18n.Tr "repo.issues.filter_type.mentioning_you"}} | ||||
<strong class="ui right">{{.IssueStats.MentionCount}}</strong> | <strong class="ui right">{{.IssueStats.MentionCount}}</strong> | ||||
</a> | </a> | ||||
{{end}} | {{end}} | ||||
<div class="ui divider"></div> | <div class="ui divider"></div> | ||||
<a class="{{if not $.RepoIDs}}ui basic blue button{{end}} repo name item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}"> | |||||
<span class="text truncate">All</span> | |||||
<div class="floating ui {{if $.IsShowClosed}}red{{else}}green{{end}} label">{{.TotalIssueCount}}</div> | |||||
</a> | |||||
{{range .Repos}} | {{range .Repos}} | ||||
<a class="{{if eq $.RepoID .ID}}ui basic blue button{{end}} repo name item" href="{{$.Link}}?type={{$.ViewType}}{{if not (eq $.RepoID .ID)}}&repo={{.ID}}{{end}}&sort={{$.SortType}}&state={{$.State}}" title="{{.FullName}}"> | |||||
<span class="text truncate">{{.FullName}}</span> | |||||
<div class="floating ui {{if $.IsShowClosed}}red{{else}}green{{end}} label">{{index $.Counts .ID}}</div> | |||||
</a> | |||||
{{with $Repo := .}} | |||||
<a class="{{range $.RepoIDs}}{{if eq . $Repo.ID}}ui basic blue button{{end}}{{end}} repo name item" href="{{$.Link}}?type={{$.ViewType}}&repos=[ | |||||
{{with $include := true}} | |||||
{{range $.RepoIDs}} | |||||
{{if eq . $Repo.ID}} | |||||
{{$include = false}} | |||||
{{else}} | |||||
{{.}}%2C | |||||
{{end}} | |||||
{{end}} | |||||
{{if eq $include true}} | |||||
{{$Repo.ID}}%2C | |||||
{{end}} | |||||
{{end}} | |||||
]&sort={{$.SortType}}&state={{$.State}}" title="{{.FullName}}"> | |||||
<span class="text truncate">{{$Repo.FullName}}</span> | |||||
<div class="floating ui {{if $.IsShowClosed}}red{{else}}green{{end}} label">{{index $.Counts $Repo.ID}}</div> | |||||
</a> | |||||
{{end}} | |||||
{{end}} | {{end}} | ||||
</div> | </div> | ||||
</div> | </div> | ||||
<div class="twelve wide column content"> | <div class="twelve wide column content"> | ||||
<div class="ui tiny basic status buttons"> | <div class="ui tiny basic status buttons"> | ||||
<a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort={{$.SortType}}&state=open"> | |||||
<a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=open"> | |||||
<i class="octicon octicon-issue-opened"></i> | <i class="octicon octicon-issue-opened"></i> | ||||
{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} | {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} | ||||
</a> | </a> | ||||
<a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort={{$.SortType}}&state=closed"> | |||||
<a class="ui {{if .IsShowClosed}}red active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort={{$.SortType}}&state=closed"> | |||||
<i class="octicon octicon-issue-closed"></i> | <i class="octicon octicon-issue-closed"></i> | ||||
{{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} | {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} | ||||
</a> | </a> | ||||
@@ -51,14 +70,14 @@ | |||||
<i class="dropdown icon"></i> | <i class="dropdown icon"></i> | ||||
</span> | </span> | ||||
<div class="menu"> | <div class="menu"> | ||||
<a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=latest&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> | |||||
<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=oldest&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a> | |||||
<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=recentupdate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a> | |||||
<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=leastupdate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a> | |||||
<a class="{{if eq .SortType "mostcomment"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=mostcomment&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.mostcomment"}}</a> | |||||
<a class="{{if eq .SortType "leastcomment"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=leastcomment&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.leastcomment"}}</a> | |||||
<a class="{{if eq .SortType "nearduedate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=nearduedate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.nearduedate"}}</a> | |||||
<a class="{{if eq .SortType "farduedate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&sort=farduedate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.farduedate"}}</a> | |||||
<a class="{{if or (eq .SortType "latest") (not .SortType)}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=latest&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.latest"}}</a> | |||||
<a class="{{if eq .SortType "oldest"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=oldest&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.oldest"}}</a> | |||||
<a class="{{if eq .SortType "recentupdate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=recentupdate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.recentupdate"}}</a> | |||||
<a class="{{if eq .SortType "leastupdate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastupdate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.leastupdate"}}</a> | |||||
<a class="{{if eq .SortType "mostcomment"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=mostcomment&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.mostcomment"}}</a> | |||||
<a class="{{if eq .SortType "leastcomment"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=leastcomment&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.leastcomment"}}</a> | |||||
<a class="{{if eq .SortType "nearduedate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=nearduedate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.nearduedate"}}</a> | |||||
<a class="{{if eq .SortType "farduedate"}}active{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]&sort=farduedate&state={{$.State}}">{{.i18n.Tr "repo.issues.filter_sort.farduedate"}}</a> | |||||
</div> | </div> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -68,7 +87,8 @@ | |||||
{{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }} | {{ $timeStr:= TimeSinceUnix .CreatedUnix $.Lang }} | ||||
<li class="item"> | <li class="item"> | ||||
<div class="ui label">{{if not $.RepoID}}{{.Repo.FullName}}{{end}}#{{.Index}}</div> | |||||
{{if .Repo}} | |||||
<div class="ui label">{{.Repo.FullName}}#{{.Index}}</div> | |||||
<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a> | <a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a> | ||||
{{if .IsPull }} | {{if .IsPull }} | ||||
@@ -84,7 +104,7 @@ | |||||
especially on mobile views. */}} | especially on mobile views. */}} | ||||
<span style="line-height: 2.5"> | <span style="line-height: 2.5"> | ||||
{{range .}} | {{range .}} | ||||
<a class="ui label has-emoji" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&repo={{$.RepoID}}" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a> | |||||
<a class="ui label has-emoji" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}&repos=[{{range $.RepoIDs}}{{.}}%2C{{end}}]" style="color: {{.ForegroundColor}}; background-color: {{.Color}}" title="{{.Description}}">{{.Name}}</a> | |||||
{{end}} | {{end}} | ||||
</span> | </span> | ||||
{{end}} | {{end}} | ||||
@@ -133,6 +153,7 @@ | |||||
{{end}} | {{end}} | ||||
</p> | </p> | ||||
</li> | </li> | ||||
{{end}} | |||||
{{end}} | {{end}} | ||||
{{template "base/paginate" .}} | {{template "base/paginate" .}} | ||||