add recommend_orgs

models/recommend_org.go

@@ -10,11 +10,15 @@ type RecommendOrg struct {
 	Order       int64              `xorm:"INDEX NOT NULL unique"`
 	OrgID       int64              `xorm:"INDEX NOT NULL unique"`
 	CreatedUnix timeutil.TimeStamp `xorm:"created"`
+}
 
-	Org *User `xorm:"-"`
+type RecommendOrgInfo struct {
+	RecommendOrg `xorm:"extends"`
+	User `xorm:"extends"`
 }
 
 type RecommendOrgList []*RecommendOrg
+type RecommendOrgInfoList []*RecommendOrgInfo
 
 func getRecommendOrgs(e Engine) (RecommendOrgList, error) {
 	orgs := make(RecommendOrgList, 0, 10)
@@ -27,6 +31,19 @@ func GetRecommendOrgs() (RecommendOrgList, error) {
 	return getRecommendOrgs(x)
 }
 
+func getRecommendOrgInfos(e Engine) (RecommendOrgInfoList, error) {
+	orgs := make(RecommendOrgInfoList, 0, 10)
+	if err := e.Table(&RecommendOrg{}).Join("INNER", "`user`", "`user`.id = `recommend_org`.org_id").
+		Find(&orgs); err != nil {
+		return orgs, err
+	}
+	return orgs, nil
+}
+
+func GetRecommendOrgInfos() (RecommendOrgInfoList, error) {
+	return getRecommendOrgInfos(x)
+}
+
 func delRecommendOrgs(e Engine) error {
 	sql := "delete from recommend_org"
 	_, err := e.Exec(sql)

routers/home.go

@@ -7,6 +7,7 @@ package routers
 
 import (
 	"bytes"
+	"net/http"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -180,10 +181,15 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	pager.AddParam(ctx, "topic", "TopicOnly")
 	ctx.Data["Page"] = pager
 
-	//todo: add recommend_orgs
-	ctx.Data["RecommendOrgs"] = ""
+	recommendOrgs, err := models.GetRecommendOrgInfos()
+	if err != nil {
+		log.Error("GetRecommendOrgInfos failed:%v", err.Error(), ctx.Data["MsgID"])
+		ctx.ServerError("GetRecommendOrgInfos", err)
+		return
+	}
+	ctx.Data["RecommendOrgs"] = recommendOrgs
 
-	ctx.HTML(200, opts.TplName)
+	ctx.HTML(http.StatusOK, opts.TplName)
 }
 
 // ExploreRepos render explore repositories page

templates/explore/repo_list.tmpl

@@ -39,13 +39,13 @@
 </style>
 
 <div class="ui secondary pointing tabular top attached borderless menu navbar">
-	<a class="active item" href="https://git.openi.org.cn/explore/repos?sort=moststars&q=&tab=">
+	<a class="active item" href="{{$.Link}}?sort=hot&q=&tab=">
 		<svg class="svg octicon-repo" width="16" height="16" aria-hidden="true">
 			<use xlink:href="#octicon-repo" />
 		</svg> 
 		热门{{.i18n.Tr "explore.repos"}}
 	</a>
-	<a class=" item" href="https://git.openi.org.cn/explore/repos?sort=mostforks&q=&tab=">
+	<a class=" item" href="{{$.Link}}?sort=active&q=&tab=">
 		<svg class="svg octicon-inbox" width="16" height="16" aria-hidden="true">
 			<use xlink:href="#octicon-inbox" />
 		</svg> 
@@ -81,6 +81,11 @@
 	</div>
 </div>
 
+<div class="ui repository list">
+	{{range .RecommendOrgs}}
+		<span>{{.Order}} {{.OrgID}} {{.User.Name}}</span>
+	{{end}}
+</div>
 <div class="ui repository list">
 	{{range .Repos}}
 		<div class="item">