Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix unclear "Owner" concept (#24233)

Browse source 
Some user/org pages use `Owner` variable. It's an incorrect concept
since year 2016: what is a user's owner?

Actually, new code is right: use `ContextUser`.

This PR cleans all legacy "Owner" variables.

## Screenshots for related pages and test results

All pages are as before:

### `web/org/home.go`


![image](https://user-images.githubusercontent.com/2114189/233366687-a3643025-1f78-474d-a901-deea35b72f4d.png)

### `web/user/profile.go`


![image](https://user-images.githubusercontent.com/2114189/233366812-2e5c2fbc-3f78-44e7-88c1-ec2f612c241e.png)

### `web/user/setting/profile.go`


![image](https://user-images.githubusercontent.com/2114189/233366928-7a1e52c9-b400-4379-a4be-af06a853c5fa.png)
This commit is contained in:
wxiaoguang 2023-04-21 01:33:30 +08:00 committed by GitHub
parent 8ea33baa1c
commit 70fc47a22a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 40 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
routers/web/org/home.go
View file

@ -143,7 +143,6 @@ func Home(ctx *context.Context) {
return return
} }
ctx.Data["Owner"] = org
ctx.Data["Repos"] = repos ctx.Data["Repos"] = repos
ctx.Data["Total"] = count ctx.Data["Total"] = count
ctx.Data["MembersTotal"] = membersCount ctx.Data["MembersTotal"] = membersCount

2
routers/web/user/profile.go
View file

@ -63,7 +63,7 @@ func Profile(ctx *context.Context) {
ctx.Data["Title"] = ctx.ContextUser.DisplayName() ctx.Data["Title"] = ctx.ContextUser.DisplayName()
ctx.Data["PageIsUserProfile"] = true ctx.Data["PageIsUserProfile"] = true
ctx.Data["Owner"] = ctx.ContextUser ctx.Data["ContextUser"] = ctx.ContextUser
ctx.Data["OpenIDs"] = openIDs ctx.Data["OpenIDs"] = openIDs
ctx.Data["IsFollowing"] = isFollowing ctx.Data["IsFollowing"] = isFollowing

2
routers/web/user/setting/profile.go
View file

@ -326,7 +326,7 @@ func Repos(ctx *context.Context) {
ctx.Data["Repos"] = repos ctx.Data["Repos"] = repos
} }
ctx.Data["Owner"] = ctxUser ctx.Data["ContextUser"] = ctxUser
pager := context.NewPagination(count, opts.PageSize, opts.Page, 5) pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
pager.SetDefaultParams(ctx) pager.SetDefaultParams(ctx)
ctx.Data["Page"] = pager ctx.Data["Page"] = pager

10
templates/base/head.tmpl
View file

@ -30,12 +30,12 @@
</style> </style>
</noscript> </noscript>
{{if .PageIsUserProfile}} {{if .PageIsUserProfile}}
<meta property="og:title" content="{{.Owner.DisplayName}}"> <meta property="og:title" content="{{.ContextUser.DisplayName}}">
<meta property="og:type" content="profile"> <meta property="og:type" content="profile">
<meta property="og:image" content="{{.Owner.AvatarLink $.Context}}"> <meta property="og:image" content="{{.ContextUser.AvatarLink $.Context}}">
<meta property="og:url" content="{{.Owner.HTMLURL}}"> <meta property="og:url" content="{{.ContextUser.HTMLURL}}">
{{if .Owner.Description}} {{if .ContextUser.Description}}
<meta property="og:description" content="{{.Owner.Description}}"> <meta property="og:description" content="{{.ContextUser.Description}}">
{{end}} {{end}}
{{else if .Repository}} {{else if .Repository}}
{{if .Issue}} {{if .Issue}}

4
templates/org/menu.tmpl
View file

@ -2,8 +2,8 @@
<div class="ui secondary stackable pointing menu"> <div class="ui secondary stackable pointing menu">
<a class="{{if .PageIsViewRepositories}}active {{end}}item" href="{{$.Org.HomeLink}}"> <a class="{{if .PageIsViewRepositories}}active {{end}}item" href="{{$.Org.HomeLink}}">
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}}
{{if .Owner.NumRepos}} {{if .ContextUser.NumRepos}}
<div class="ui small label">{{.Owner.NumRepos}}</div> <div class="ui small label">{{.ContextUser.NumRepos}}</div>
{{end}} {{end}}
</a> </a>
{{if and .IsProjectEnabled .CanReadProjects}} {{if and .IsProjectEnabled .CanReadProjects}}

4
templates/user/overview/header.tmpl
View file

@ -67,8 +67,8 @@
{{if not .DisableStars}} {{if not .DisableStars}}
<a class='{{if eq .TabName "stars"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=stars"> <a class='{{if eq .TabName "stars"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=stars">
{{svg "octicon-star"}} {{.locale.Tr "user.starred"}} {{svg "octicon-star"}} {{.locale.Tr "user.starred"}}
{{if .Owner.NumStars}} {{if .ContextUser.NumStars}}
<div class="ui primary label">{{.Owner.NumStars}}</div> <div class="ui primary label">{{.ContextUser.NumStars}}</div>
{{end}} {{end}}
</a> </a>
{{else}} {{else}}

56
templates/user/profile.tmpl
View file

@ -5,35 +5,35 @@
<div class="ui five wide column"> <div class="ui five wide column">
<div class="ui card"> <div class="ui card">
<div id="profile-avatar" class="content gt-df"> <div id="profile-avatar" class="content gt-df">
{{if eq .SignedUserName .Owner.Name}} {{if eq .SignedUserName .ContextUser.Name}}
<a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{.locale.Tr "user.change_avatar"}}"> <a class="image" href="{{AppSubUrl}}/user/settings" data-tooltip-content="{{.locale.Tr "user.change_avatar"}}">
{{avatar $.Context .Owner 290}} {{avatar $.Context .ContextUser 290}}
</a> </a>
{{else}} {{else}}
<span class="image"> <span class="image">
{{avatar $.Context .Owner 290}} {{avatar $.Context .ContextUser 290}}
</span> </span>
{{end}} {{end}}
</div> </div>
<div class="content gt-word-break profile-avatar-name"> <div class="content gt-word-break profile-avatar-name">
{{if .Owner.FullName}}<span class="header text center">{{.Owner.FullName}}</span>{{end}} {{if .ContextUser.FullName}}<span class="header text center">{{.ContextUser.FullName}}</span>{{end}}
<span class="username text center">{{.Owner.Name}}</span> <span class="username text center">{{.ContextUser.Name}}</span>
{{if .EnableFeed}} {{if .EnableFeed}}
<a href="{{.Owner.HomeLink}}.rss"><i class="ui text grey gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a> <a href="{{.ContextUser.HomeLink}}.rss"><i class="ui text grey gt-ml-3" data-tooltip-content="{{.locale.Tr "rss_feed"}}">{{svg "octicon-rss" 18}}</i></a>
{{end}} {{end}}
<div class="gt-mt-3"> <div class="gt-mt-3">
<a class="muted" href="{{.Owner.HomeLink}}?tab=followers">{{svg "octicon-person" 18 "gt-mr-2"}}{{.Owner.NumFollowers}} {{.locale.Tr "user.followers"}}</a> · <a class="muted" href="{{.Owner.HomeLink}}?tab=following">{{.Owner.NumFollowing}} {{.locale.Tr "user.following"}}</a> <a class="muted" href="{{.ContextUser.HomeLink}}?tab=followers">{{svg "octicon-person" 18 "gt-mr-2"}}{{.ContextUser.NumFollowers}} {{.locale.Tr "user.followers"}}</a> · <a class="muted" href="{{.ContextUser.HomeLink}}?tab=following">{{.ContextUser.NumFollowing}} {{.locale.Tr "user.following"}}</a>
</div> </div>
</div> </div>
<div class="extra content gt-word-break"> <div class="extra content gt-word-break">
<ul> <ul>
{{if .Owner.Location}} {{if .ContextUser.Location}}
<li>{{svg "octicon-location"}} {{.Owner.Location}}</li> <li>{{svg "octicon-location"}} {{.ContextUser.Location}}</li>
{{end}} {{end}}
{{if (eq .SignedUserName .Owner.Name)}} {{if (eq .SignedUserName .ContextUser.Name)}}
<li> <li>
{{svg "octicon-mail"}} {{svg "octicon-mail"}}
<a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a> <a href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
<a href="{{AppSubUrl}}/user/settings#keep-email-private"> <a href="{{AppSubUrl}}/user/settings#keep-email-private">
{{if .ShowUserEmail}} {{if .ShowUserEmail}}
<i class="ui right" data-tooltip-content="{{.locale.Tr "user.email_visibility.limited"}}"> <i class="ui right" data-tooltip-content="{{.locale.Tr "user.email_visibility.limited"}}">
@ -50,14 +50,14 @@
{{if .ShowUserEmail}} {{if .ShowUserEmail}}
<li> <li>
{{svg "octicon-mail"}} {{svg "octicon-mail"}}
<a href="mailto:{{.Owner.Email}}" rel="nofollow">{{.Owner.Email}}</a> <a href="mailto:{{.ContextUser.Email}}" rel="nofollow">{{.ContextUser.Email}}</a>
</li> </li>
{{end}} {{end}}
{{end}} {{end}}
{{if .Owner.Website}} {{if .ContextUser.Website}}
<li> <li>
{{svg "octicon-link"}} {{svg "octicon-link"}}
<a target="_blank" rel="noopener noreferrer me" href="{{.Owner.Website}}">{{.Owner.Website}}</a> <a target="_blank" rel="noopener noreferrer me" href="{{.ContextUser.Website}}">{{.ContextUser.Website}}</a>
</li> </li>
{{end}} {{end}}
{{if $.RenderedDescription}} {{if $.RenderedDescription}}
@ -73,7 +73,7 @@
</li> </li>
{{end}} {{end}}
{{end}} {{end}}
<li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .Owner.CreatedUnix.FormatLong "Fallback" .Owner.CreatedUnix.FormatShort)}}</li> <li>{{svg "octicon-clock"}} {{.locale.Tr "user.join_on"}} {{template "shared/datetime/short" (dict "Datetime" .ContextUser.CreatedUnix.FormatLong "Fallback" .ContextUser.CreatedUnix.FormatShort)}}</li>
{{if and .Orgs .HasOrgsVisible}} {{if and .Orgs .HasOrgsVisible}}
<li> <li>
<ul class="user-orgs"> <ul class="user-orgs">
@ -100,7 +100,7 @@
</ul> </ul>
</li> </li>
{{end}} {{end}}
{{if and .IsSigned (ne .SignedUserName .Owner.Name)}} {{if and .IsSigned (ne .SignedUserName .ContextUser.Name)}}
<li class="follow"> <li class="follow">
{{if $.IsFollowing}} {{if $.IsFollowing}}
<form method="post" action="{{.Link}}?action=unfollow&redirect_to={{$.Link}}"> <form method="post" action="{{.Link}}?action=unfollow&redirect_to={{$.Link}}">
@ -121,44 +121,44 @@
</div> </div>
<div class="ui eleven wide column"> <div class="ui eleven wide column">
<div class="ui secondary stackable pointing tight menu"> <div class="ui secondary stackable pointing tight menu">
<a class='{{if and (ne .TabName "activity") (ne .TabName "following") (ne .TabName "followers") (ne .TabName "stars") (ne .TabName "watching") (ne .TabName "projects") (ne .TabName "code")}}active {{end}}item' href="{{.Owner.HomeLink}}"> <a class='{{if and (ne .TabName "activity") (ne .TabName "following") (ne .TabName "followers") (ne .TabName "stars") (ne .TabName "watching") (ne .TabName "projects") (ne .TabName "code")}}active {{end}}item' href="{{.ContextUser.HomeLink}}">
{{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}} {{svg "octicon-repo"}} {{.locale.Tr "user.repositories"}}
{{if .Owner.NumRepos}} {{if .ContextUser.NumRepos}}
<div class="ui small label">{{.Owner.NumRepos}}</div> <div class="ui small label">{{.ContextUser.NumRepos}}</div>
{{end}} {{end}}
</a> </a>
<a href="{{.Owner.HomeLink}}/-/projects" class="{{if eq .TabName "projects"}}active {{end}}item"> <a href="{{.ContextUser.HomeLink}}/-/projects" class="{{if eq .TabName "projects"}}active {{end}}item">
{{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}} {{svg "octicon-project-symlink"}} {{.locale.Tr "user.projects"}}
</a> </a>
{{if .IsPackageEnabled}} {{if .IsPackageEnabled}}
<a class='{{if eq .TabName "packages"}}active {{end}}item' href="{{.Owner.HomeLink}}/-/packages"> <a class='{{if eq .TabName "packages"}}active {{end}}item' href="{{.ContextUser.HomeLink}}/-/packages">
{{svg "octicon-package"}} {{.locale.Tr "packages.title"}} {{svg "octicon-package"}} {{.locale.Tr "packages.title"}}
</a> </a>
{{end}} {{end}}
{{if .IsRepoIndexerEnabled}} {{if .IsRepoIndexerEnabled}}
<a class='{{if eq .TabName "code"}}active {{end}}item' href="{{.Owner.HomeLink}}/-/code"> <a class='{{if eq .TabName "code"}}active {{end}}item' href="{{.ContextUser.HomeLink}}/-/code">
{{svg "octicon-code"}} {{.locale.Tr "user.code"}} {{svg "octicon-code"}} {{.locale.Tr "user.code"}}
</a> </a>
{{end}} {{end}}
<a class='{{if eq .TabName "activity"}}active {{end}}item' href="{{.Owner.HomeLink}}?tab=activity"> <a class='{{if eq .TabName "activity"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=activity">
{{svg "octicon-rss"}} {{.locale.Tr "user.activity"}} {{svg "octicon-rss"}} {{.locale.Tr "user.activity"}}
</a> </a>
{{if not .DisableStars}} {{if not .DisableStars}}
<a class='{{if eq .TabName "stars"}}active {{end}}item' href="{{.Owner.HomeLink}}?tab=stars"> <a class='{{if eq .TabName "stars"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=stars">
{{svg "octicon-star"}} {{.locale.Tr "user.starred"}} {{svg "octicon-star"}} {{.locale.Tr "user.starred"}}
{{if .Owner.NumStars}} {{if .ContextUser.NumStars}}
<div class="ui small label">{{.Owner.NumStars}}</div> <div class="ui small label">{{.ContextUser.NumStars}}</div>
{{end}} {{end}}
</a> </a>
{{else}} {{else}}
<a class='{{if eq .TabName "watching"}}active {{end}}item' href="{{.Owner.HomeLink}}?tab=watching"> <a class='{{if eq .TabName "watching"}}active {{end}}item' href="{{.ContextUser.HomeLink}}?tab=watching">
{{svg "octicon-eye"}} {{.locale.Tr "user.watched"}} {{svg "octicon-eye"}} {{.locale.Tr "user.watched"}}
</a> </a>
{{end}} {{end}}
</div> </div>
{{if eq .TabName "activity"}} {{if eq .TabName "activity"}}
{{if .Owner.KeepActivityPrivate}} {{if .ContextUser.KeepActivityPrivate}}
<div class="ui info message"> <div class="ui info message">
<p>{{.locale.Tr "user.disabled_public_activity"}}</p> <p>{{.locale.Tr "user.disabled_public_activity"}}</p>
</div> </div>

2
templates/user/settings/repos.tmpl
View file

@ -34,7 +34,7 @@
{{end}} {{end}}
{{else}} {{else}}
<span class="icon">{{svg "octicon-file-directory-fill"}}</span> <span class="icon">{{svg "octicon-file-directory-fill"}}</span>
<span class="name">{{$.Owner.Name}}/{{$dir}}</span> <span class="name">{{$.ContextUser.Name}}/{{$dir}}</span>
<div class="right floated content"> <div class="right floated content">
{{if $.allowAdopt}} {{if $.allowAdopt}}
<button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button> <button class="ui button submit tiny green adopt show-modal" data-modal="#adopt-unadopted-modal-{{$dirI}}"><span class="icon">{{svg "octicon-plus"}}</span><span class="label">{{$.locale.Tr "repo.adopt_preexisting_label"}}</span></button>