mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 20:36:07 +01:00 
			
		
		
		
	Add show more organizations icon in user's profile (#32986)
				
					
				
			Close #32952 # ⚠️ Doc update is required   ------ ⚠️This PR refuses to be cherry-picked by any forked projects without any mentions. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		@@ -1339,6 +1339,9 @@ LEVEL = Info
 | 
				
			|||||||
;; Number of repos that are displayed on one page
 | 
					;; Number of repos that are displayed on one page
 | 
				
			||||||
;REPO_PAGING_NUM = 15
 | 
					;REPO_PAGING_NUM = 15
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					;; Number of orgs that are displayed on profile page
 | 
				
			||||||
 | 
					;ORG_PAGING_NUM = 15
 | 
				
			||||||
 | 
					
 | 
				
			||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
					;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
				
			||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
					;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 | 
				
			||||||
;[ui.meta]
 | 
					;[ui.meta]
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -63,6 +63,7 @@ var UI = struct {
 | 
				
			|||||||
	} `ini:"ui.admin"`
 | 
						} `ini:"ui.admin"`
 | 
				
			||||||
	User struct {
 | 
						User struct {
 | 
				
			||||||
		RepoPagingNum int
 | 
							RepoPagingNum int
 | 
				
			||||||
 | 
							OrgPagingNum  int
 | 
				
			||||||
	} `ini:"ui.user"`
 | 
						} `ini:"ui.user"`
 | 
				
			||||||
	Meta struct {
 | 
						Meta struct {
 | 
				
			||||||
		Author      string
 | 
							Author      string
 | 
				
			||||||
@@ -127,8 +128,10 @@ var UI = struct {
 | 
				
			|||||||
	},
 | 
						},
 | 
				
			||||||
	User: struct {
 | 
						User: struct {
 | 
				
			||||||
		RepoPagingNum int
 | 
							RepoPagingNum int
 | 
				
			||||||
 | 
							OrgPagingNum  int
 | 
				
			||||||
	}{
 | 
						}{
 | 
				
			||||||
		RepoPagingNum: 15,
 | 
							RepoPagingNum: 15,
 | 
				
			||||||
 | 
							OrgPagingNum:  15,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
	Meta: struct {
 | 
						Meta: struct {
 | 
				
			||||||
		Author      string
 | 
							Author      string
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -649,6 +649,7 @@ joined_on = Joined on %s
 | 
				
			|||||||
repositories = Repositories
 | 
					repositories = Repositories
 | 
				
			||||||
activity = Public Activity
 | 
					activity = Public Activity
 | 
				
			||||||
followers = Followers
 | 
					followers = Followers
 | 
				
			||||||
 | 
					show_more = Show More
 | 
				
			||||||
starred = Starred Repositories
 | 
					starred = Starred Repositories
 | 
				
			||||||
watched = Watched Repositories
 | 
					watched = Watched Repositories
 | 
				
			||||||
code = Code
 | 
					code = Code
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -61,11 +61,20 @@ func PrepareContextForProfileBigAvatar(ctx *context.Context) {
 | 
				
			|||||||
	orgs, err := db.Find[organization.Organization](ctx, organization.FindOrgOptions{
 | 
						orgs, err := db.Find[organization.Organization](ctx, organization.FindOrgOptions{
 | 
				
			||||||
		UserID:         ctx.ContextUser.ID,
 | 
							UserID:         ctx.ContextUser.ID,
 | 
				
			||||||
		IncludePrivate: showPrivate,
 | 
							IncludePrivate: showPrivate,
 | 
				
			||||||
 | 
							ListOptions: db.ListOptions{
 | 
				
			||||||
 | 
								Page: 1,
 | 
				
			||||||
 | 
								// query one more results (without a separate counting) to see whether we need to add the "show more orgs" link
 | 
				
			||||||
 | 
								PageSize: setting.UI.User.OrgPagingNum + 1,
 | 
				
			||||||
 | 
							},
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
	if err != nil {
 | 
						if err != nil {
 | 
				
			||||||
		ctx.ServerError("FindOrgs", err)
 | 
							ctx.ServerError("FindOrgs", err)
 | 
				
			||||||
		return
 | 
							return
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
						if len(orgs) > setting.UI.User.OrgPagingNum {
 | 
				
			||||||
 | 
							orgs = orgs[:setting.UI.User.OrgPagingNum]
 | 
				
			||||||
 | 
							ctx.Data["ShowMoreOrgs"] = true
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
	ctx.Data["Orgs"] = orgs
 | 
						ctx.Data["Orgs"] = orgs
 | 
				
			||||||
	ctx.Data["HasOrgsVisible"] = organization.HasOrgsVisible(ctx, orgs, ctx.Doer)
 | 
						ctx.Data["HasOrgsVisible"] = organization.HasOrgsVisible(ctx, orgs, ctx.Doer)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -12,6 +12,7 @@ import (
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	activities_model "code.gitea.io/gitea/models/activities"
 | 
						activities_model "code.gitea.io/gitea/models/activities"
 | 
				
			||||||
	"code.gitea.io/gitea/models/db"
 | 
						"code.gitea.io/gitea/models/db"
 | 
				
			||||||
 | 
						"code.gitea.io/gitea/models/organization"
 | 
				
			||||||
	"code.gitea.io/gitea/models/renderhelper"
 | 
						"code.gitea.io/gitea/models/renderhelper"
 | 
				
			||||||
	repo_model "code.gitea.io/gitea/models/repo"
 | 
						repo_model "code.gitea.io/gitea/models/repo"
 | 
				
			||||||
	user_model "code.gitea.io/gitea/models/user"
 | 
						user_model "code.gitea.io/gitea/models/user"
 | 
				
			||||||
@@ -256,6 +257,21 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 | 
				
			|||||||
				ctx.Data["ProfileReadme"] = profileContent
 | 
									ctx.Data["ProfileReadme"] = profileContent
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
						case "organizations":
 | 
				
			||||||
 | 
							orgs, count, err := db.FindAndCount[organization.Organization](ctx, organization.FindOrgOptions{
 | 
				
			||||||
 | 
								UserID:         ctx.ContextUser.ID,
 | 
				
			||||||
 | 
								IncludePrivate: showPrivate,
 | 
				
			||||||
 | 
								ListOptions: db.ListOptions{
 | 
				
			||||||
 | 
									Page:     page,
 | 
				
			||||||
 | 
									PageSize: pagingNum,
 | 
				
			||||||
 | 
								},
 | 
				
			||||||
 | 
							})
 | 
				
			||||||
 | 
							if err != nil {
 | 
				
			||||||
 | 
								ctx.ServerError("GetUserOrganizations", err)
 | 
				
			||||||
 | 
								return
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
 | 
							ctx.Data["Cards"] = orgs
 | 
				
			||||||
 | 
							total = int(count)
 | 
				
			||||||
	default: // default to "repositories"
 | 
						default: // default to "repositories"
 | 
				
			||||||
		repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
 | 
							repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
 | 
				
			||||||
			ListOptions: db.ListOptions{
 | 
								ListOptions: db.ListOptions{
 | 
				
			||||||
@@ -294,31 +310,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pager := context.NewPagination(total, pagingNum, page, 5)
 | 
						pager := context.NewPagination(total, pagingNum, page, 5)
 | 
				
			||||||
	pager.SetDefaultParams(ctx)
 | 
						pager.AddParamFromRequest(ctx.Req)
 | 
				
			||||||
	pager.AddParamString("tab", tab)
 | 
					 | 
				
			||||||
	if tab != "followers" && tab != "following" && tab != "activity" && tab != "projects" {
 | 
					 | 
				
			||||||
		pager.AddParamString("language", language)
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	if tab == "activity" {
 | 
					 | 
				
			||||||
		if ctx.Data["Date"] != nil {
 | 
					 | 
				
			||||||
			pager.AddParamString("date", fmt.Sprint(ctx.Data["Date"]))
 | 
					 | 
				
			||||||
		}
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	if archived.Has() {
 | 
					 | 
				
			||||||
		pager.AddParamString("archived", fmt.Sprint(archived.Value()))
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	if fork.Has() {
 | 
					 | 
				
			||||||
		pager.AddParamString("fork", fmt.Sprint(fork.Value()))
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	if mirror.Has() {
 | 
					 | 
				
			||||||
		pager.AddParamString("mirror", fmt.Sprint(mirror.Value()))
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	if template.Has() {
 | 
					 | 
				
			||||||
		pager.AddParamString("template", fmt.Sprint(template.Value()))
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	if private.Has() {
 | 
					 | 
				
			||||||
		pager.AddParamString("private", fmt.Sprint(private.Value()))
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
	ctx.Data["Page"] = pager
 | 
						ctx.Data["Page"] = pager
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -92,6 +92,9 @@
 | 
				
			|||||||
					</li>
 | 
										</li>
 | 
				
			||||||
					{{end}}
 | 
										{{end}}
 | 
				
			||||||
				{{end}}
 | 
									{{end}}
 | 
				
			||||||
 | 
										{{if .ShowMoreOrgs}}
 | 
				
			||||||
 | 
											<li><a class="tw-align-center" href="{{.ContextUser.HomeLink}}?tab=organizations" data-tooltip-content="{{ctx.Locale.Tr "user.show_more"}}">{{svg "octicon-kebab-horizontal" 28 "icon tw-p-1"}}</a></li>
 | 
				
			||||||
 | 
										{{end}}
 | 
				
			||||||
				</ul>
 | 
									</ul>
 | 
				
			||||||
			</li>
 | 
								</li>
 | 
				
			||||||
			{{end}}
 | 
								{{end}}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -27,6 +27,8 @@
 | 
				
			|||||||
					{{template "repo/user_cards" .}}
 | 
										{{template "repo/user_cards" .}}
 | 
				
			||||||
				{{else if eq .TabName "overview"}}
 | 
									{{else if eq .TabName "overview"}}
 | 
				
			||||||
					<div id="readme_profile" class="markup">{{.ProfileReadme}}</div>
 | 
										<div id="readme_profile" class="markup">{{.ProfileReadme}}</div>
 | 
				
			||||||
 | 
									{{else if eq .TabName "organizations"}}
 | 
				
			||||||
 | 
										{{template "repo/user_cards" .}}
 | 
				
			||||||
				{{else}}
 | 
									{{else}}
 | 
				
			||||||
					{{template "shared/repo_search" .}}
 | 
										{{template "shared/repo_search" .}}
 | 
				
			||||||
					{{template "explore/repo_list" .}}
 | 
										{{template "explore/repo_list" .}}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user