diff --git a/routers/web/explore/competence.go b/routers/web/explore/competence.go index d65ecc453d..0fb9d90067 100644 --- a/routers/web/explore/competence.go +++ b/routers/web/explore/competence.go @@ -1,10 +1,13 @@ package explore import ( + "code.gitea.io/gitea/models/db" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/setting" - "net/http" + "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" ) const ( @@ -18,5 +21,12 @@ func Competences(ctx *context.Context) { ctx.Data["PageIsExplore"] = true ctx.Data["PageIsExploreCompetences"] = true - ctx.HTML(http.StatusOK, tplExploreCompetences) + RenderUserSearch(ctx, &user_model.SearchUserOptions{ + Actor: ctx.User, + Type: user_model.UserTypeIndividual, + ListOptions: db.ListOptions{PageSize: setting.UI.ExplorePagingNum}, + IsActive: util.OptionalBoolTrue, + Visible: []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate}, + }, tplExploreCompetences) + } diff --git a/templates/explore/competences.tmpl b/templates/explore/competences.tmpl index 730e194328..7b9382d5a4 100644 --- a/templates/explore/competences.tmpl +++ b/templates/explore/competences.tmpl @@ -6,7 +6,26 @@ {{template "explore/search" .}}
- Здесь будет список пользователей заложен + {{range .Users}} +
+ {{avatar .}} +
+ {{.Name}} {{.FullName}} +
+ {{if .Location}} + {{svg "octicon-location"}} {{.Location}} ({{.LocationCoordinate}}) + {{end}} + {{if and $.ShowUserEmail .Email $.IsSigned (not .KeepEmailPrivate)}} + {{svg "octicon-mail"}} + {{.Email}} + {{end}} + {{svg "octicon-clock"}} {{$.i18n.Tr "user.join_on"}} {{.CreatedUnix.FormatShort}} +
+
+
+ {{else}} +
{{$.i18n.Tr "explore.user_no_results"}}
+ {{end}}
{{template "base/paginate" .}}