Merge remote-tracking branch 'origin/V20211115' into zouap

routers/api/v1/repo/repo_dashbord.go

@@ -21,6 +21,7 @@ type ProjectsPeriodData struct {
 	LastUpdatedTime string                  `json:"lastUpdatedTime"`
 	PageSize        int                     `json:"pageSize"`
 	TotalPage       int                     `json:"totalPage"`
+	TotalCount      int64                   `json:"totalCount"`
 	PageRecords     []*models.RepoStatistic `json:"pageRecords"`
 }
 
@@ -107,6 +108,7 @@ func GetAllProjectsPeriodStatistics(ctx *context.Context) {
 		RecordBeginTime: recordBeginTime.Format(DATE_FORMAT),
 		PageSize:        pageSize,
 		TotalPage:       getTotalPage(total, pageSize),
+		TotalCount:      total,
 		LastUpdatedTime: latestUpdatedTime,
 		PageRecords:     models.GetRepoStatisticByRawSql(generatePageSql(beginTime, endTime, latestDate, q, orderBy, page, pageSize)),
 	}

templates/org/home.tmpl

@@ -39,7 +39,7 @@
 						<h4 class="ui top attached header">
 							<strong>{{.i18n.Tr "org.people"}}</strong>
 							<div class="ui right">
-								<a class="text grey" href="{{.OrgLink}}/members">{{.Org.NumMembers}} {{svg "octicon-chevron-right" 16}}</a>
+								<a class="text grey" href="{{.OrgLink}}/members">{{.MembersTotal}} {{svg "octicon-chevron-right" 16}}</a>
 							</div>
 							<!-- {{if .IsOrganizationMember}} -->