[UI] IssuePage multi repo select

integrations/links_test.go

@@ -72,19 +72,20 @@ func testLinksAsUser(userName string, t *testing.T) {
 		"/api/swagger",
 		"/api/v1/swagger",
 		"/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?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",
 		"/repo/create",
 		"/repo/migrate",

models/fixtures/issue.yml

@@ -96,4 +96,4 @@
   is_closed: false
   is_pull: true
   created_unix: 946684820
-  updated_unix: 978307180
+  updated_unix: 978307180

models/fixtures/issue_assignees.yml

@@ -6,3 +6,7 @@
   id: 2
   assignee_id: 1
   issue_id: 6
+-
+  id: 3
+  assignee_id: 2
+  issue_id: 6

models/issue.go

@@ -1378,7 +1378,7 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) {
 // UserIssueStatsOptions contains parameters accepted by GetUserIssueStats.
 type UserIssueStatsOptions struct {
 	UserID      int64
-	RepoID      int64
+	RepoIDs     []int64
 	UserRepoIDs []int64
 	FilterMode  int
 	IsPull      bool
@@ -1392,19 +1392,19 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
 
 	cond := builder.NewCond()
 	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 {
 	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)).
 			Count(new(Issue))
 		if err != nil {
 			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)).
 			Count(new(Issue))
 		if err != nil {
@@ -1426,14 +1426,14 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
 			return nil, err
 		}
 	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))
 		if err != nil {
 			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))
 		if err != nil {
 			return nil, err

models/issue_test.go

@@ -180,7 +180,7 @@ func TestGetUserIssueStats(t *testing.T) {
 		{
 			UserIssueStatsOptions{
 				UserID:     1,
-				RepoID:     1,
+				RepoIDs:    []int64{1},
 				FilterMode: FilterModeAll,
 			},
 			IssueStats{

routers/user/home.go

@@ -7,8 +7,11 @@ package user
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
+	"regexp"
 	"sort"
+	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -20,7 +23,6 @@ import (
 
 	"github.com/keybase/go-crypto/openpgp"
 	"github.com/keybase/go-crypto/openpgp/armor"
-	"github.com/unknwon/com"
 )
 
 const (
@@ -149,6 +151,9 @@ func Dashboard(ctx *context.Context) {
 	ctx.HTML(200, tplDashboard)
 }
 
+// Regexp for repos query
+var issueReposQueryPattern = regexp.MustCompile(`^\[\d+(,\d+)*,?\]$`)
+
 // Issues render the user issues page
 func Issues(ctx *context.Context) {
 	isPullList := ctx.Params(":type") == "pulls"
@@ -194,7 +199,25 @@ func Issues(ctx *context.Context) {
 		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"
 
 	// Get repositories.
@@ -232,20 +255,9 @@ func Issues(ctx *context.Context) {
 		SortType: sortType,
 	}
 
-	if repoID > 0 {
-		opts.RepoIDs = []int64{repoID}
-	}
-
 	switch filterMode {
 	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:
 		opts.AssigneeID = ctxUser.ID
 	case models.FilterModeCreate:
@@ -273,6 +285,10 @@ func Issues(ctx *context.Context) {
 	}
 	opts.LabelIDs = labelIDs
 
+	if len(repoIDs) > 0 {
+		opts.RepoIDs = repoIDs
+	}
+
 	issues, err := models.Issues(opts)
 	if err != nil {
 		ctx.ServerError("Issues", err)
@@ -281,46 +297,30 @@ func Issues(ctx *context.Context) {
 
 	showReposMap := make(map[int64]*models.Repository, len(counts))
 	for repoID := range counts {
-		repo, err := models.GetRepositoryByID(repoID)
-		if err != nil {
-			ctx.ServerError("GetRepositoryByID", err)
-			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
+		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
 			}
-			showReposMap[repoID] = repo
-		}
 
-		repo := showReposMap[repoID]
+			repo := showReposMap[repoID]
 
-		// Check if user has access to given repository.
-		perm, err := models.GetUserRepoPermission(repo, ctxUser)
-		if err != nil {
-			ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", repoID, err))
-			return
-		}
-		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)
+			// Check if user has access to given repository.
+			perm, err := models.GetUserRepoPermission(repo, ctxUser)
+			if err != nil {
+				ctx.ServerError("GetUserRepoPermission", fmt.Errorf("[%d]%v", repoID, err))
+				return
+			}
+			if !perm.CanRead(models.UnitTypeIssues) {
+				log.Error("User created Issues in Repository which they no longer have access to: [%d]", repoID)
 			}
-			ctx.Status(404)
-			return
 		}
 	}
 
@@ -342,7 +342,7 @@ func Issues(ctx *context.Context) {
 
 	issueStats, err := models.GetUserIssueStats(models.UserIssueStatsOptions{
 		UserID:      ctxUser.ID,
-		RepoID:      repoID,
+		RepoIDs:     repoIDs,
 		UserRepoIDs: userRepoIDs,
 		FilterMode:  filterMode,
 		IsPull:      isPullList,
@@ -353,11 +353,26 @@ func Issues(ctx *context.Context) {
 		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 {
-		total = int(issueStats.OpenCount)
+		shownIssues = int(issueStats.OpenCount)
+		totalIssues = int(allIssueStats.OpenCount)
 	} else {
-		total = int(issueStats.ClosedCount)
+		shownIssues = int(issueStats.ClosedCount)
+		totalIssues = int(allIssueStats.ClosedCount)
 	}
 
 	ctx.Data["Issues"] = issues
@@ -367,18 +382,24 @@ func Issues(ctx *context.Context) {
 	ctx.Data["IssueStats"] = issueStats
 	ctx.Data["ViewType"] = viewType
 	ctx.Data["SortType"] = sortType
-	ctx.Data["RepoID"] = repoID
+	ctx.Data["RepoIDs"] = repoIDs
 	ctx.Data["IsShowClosed"] = isShowClosed
+	ctx.Data["TotalIssueCount"] = totalIssues
 
 	if isShowClosed {
 		ctx.Data["State"] = "closed"
 	} else {
 		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, "repo", "RepoID")
+	pager.AddParam(ctx, "repos", "ReposParam")
 	pager.AddParam(ctx, "sort", "SortType")
 	pager.AddParam(ctx, "state", "State")
 	pager.AddParam(ctx, "labels", "SelectLabels")