fix-stats-count

Author: 6543

models/issue_milestone.go

@@ -543,28 +543,23 @@ func GetMilestonesByRepoIDs(repoIDs []int64, page int, isClosed bool, sortType s
 	return miles, sess.Find(&miles)
 }
 
-// UserMilestoneStats represents milestone statistic information.
-type UserMilestoneStats struct {
+// MilestonesStats represents milestone statistic information.
+type MilestonesStats struct {
 	OpenCount, ClosedCount int64
 }
 
-// GetUserMilestoneStats returns milestone statistic information for dashboard by given conditions.
-func GetUserMilestoneStats(userID int64, repoID int64, userRepoIDs []int64) (*UserMilestoneStats, error) {
+// GetMilestonesStats returns milestone statistic information for dashboard by given conditions.
+func GetMilestonesStats(userRepoIDs []int64) (*MilestonesStats, error) {
 	var err error
-	stats := &UserMilestoneStats{}
+	stats := &MilestonesStats{}
 
-	cond := builder.NewCond()
-	if repoID > 0 {
-		cond = cond.And(builder.Eq{"repo_id": repoID})
-	}
-
-	stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false).
+	stats.OpenCount, err = x.Where("is_closed = ?", false).
 		And(builder.In("repo_id", userRepoIDs)).
 		Count(new(Milestone))
 	if err != nil {
 		return nil, err
 	}
-	stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true).
+	stats.ClosedCount, err = x.Where("is_closed = ?", true).
 		And(builder.In("repo_id", userRepoIDs)).
 		Count(new(Milestone))
 	if err != nil {

routers/user/home.go

@@ -285,9 +285,9 @@ func Milestones(ctx *context.Context) {
 		}
 	}
 
-	milestoneStats, err := models.GetUserMilestoneStats(ctxUser.ID, repoID, userRepoIDs)
+	milestoneStats, err := models.GetMilestonesStats(userRepoIDs)
 	if err != nil {
-		ctx.ServerError("GetUserMilestoneStats", err)
+		ctx.ServerError("GetMilestoneStats", err)
 		return
 	}
 

templates/user/dashboard/milestones.tmpl

@@ -5,7 +5,7 @@
 		<div class="ui stackable grid">
 			<div class="four wide column">
 				<div class="ui secondary vertical filter menu">
-					<a class="item" href="{{.Link}}?type=your_repositories&repo={{.RepoID}}&sort={{$.SortType}}&state={{.State}}">
+					<a class="item" href="{{.Link}}?type=your_repositories&sort={{$.SortType}}&state={{.State}}">
 						{{.i18n.Tr "home.issues.in_your_repos"}}
 						<strong class="ui right">{{.Total}}</strong>
 					</a>