Skip to content

Commit f834e6d

Browse files
hiifonghiifong
committed
fix test
1 parent fec8a8e commit f834e6d

File tree

15 files changed

+29
-30
lines changed

15 files changed

+29
-30
lines changed

‎models/user/user.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"context"
99
"encoding/hex"
1010
"fmt"
11+
_ "image/jpeg" // Needed for jpeg support
1112
"mime"
1213
"net/mail"
1314
"net/url"
@@ -18,8 +19,6 @@ import (
1819
"time"
1920
"unicode"
2021

21-
_ "image/jpeg" // Needed for jpeg support
22-
2322
"code.gitea.io/gitea/models/auth"
2423
"code.gitea.io/gitea/models/db"
2524
"code.gitea.io/gitea/modules/auth/openid"
@@ -197,11 +196,11 @@ func (u *User) BeforeUpdate() {
197196
u.Description = util.TruncateRunes(u.Description, 255)
198197
}
199198

200-
// AfterLoad is invoked from XORM after filling all the fields of this object.
201-
func (u *User) AfterLoad() {
199+
func (u *User) GetTheme(ctx context.Context) string {
202200
if u.Theme == "" {
203-
u.Theme = setting.Config().UI.DefaultTheme.Value(context.Background())
201+
return setting.Config().UI.DefaultTheme.Value(ctx)
204202
}
203+
return u.Theme
205204
}
206205

207206
// SetLastLogin set time to last login

‎modules/templates/helper.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,11 @@ func evalTokens(tokens ...any) (any, error) {
264264
}
265265

266266
func userThemeName(ctx context.Context, user *user_model.User) string {
267-
if user == nil || user.Theme == "" {
267+
if user == nil || user.GetTheme(ctx) == "" {
268268
return setting.Config().UI.DefaultTheme.Value(ctx)
269269
}
270-
if webtheme.IsThemeAvailable(ctx, user.Theme) {
271-
return user.Theme
270+
if webtheme.IsThemeAvailable(ctx, user.GetTheme(ctx)) {
271+
return user.GetTheme(ctx)
272272
}
273273
return setting.Config().UI.DefaultTheme.Value(ctx)
274274
}

‎routers/api/v1/user/settings.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func GetUserSettings(ctx *context.APIContext) {
2424
// responses:
2525
// "200":
2626
// "$ref": "#/responses/UserSettings"
27-
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
27+
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx, ctx.Doer))
2828
}
2929

3030
// UpdateUserSettings returns user settings
@@ -61,5 +61,5 @@ func UpdateUserSettings(ctx *context.APIContext) {
6161
return
6262
}
6363

64-
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx.Doer))
64+
ctx.JSON(http.StatusOK, convert.User2UserSettings(ctx, ctx.Doer))
6565
}

‎services/convert/user.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ func toUser(ctx context.Context, user *user_model.User, signed, authed bool) *ap
8686
}
8787

8888
// User2UserSettings return UserSettings based on a user
89-
func User2UserSettings(user *user_model.User) api.UserSettings {
89+
func User2UserSettings(ctx context.Context, user *user_model.User) api.UserSettings {
9090
return api.UserSettings{
9191
FullName: user.FullName,
9292
Website: user.Website,
9393
Location: user.Location,
9494
Language: user.Language,
9595
Description: user.Description,
96-
Theme: user.Theme,
96+
Theme: user.GetTheme(ctx),
9797
HideEmail: user.KeepEmailPrivate,
9898
HideActivity: user.KeepActivityPrivate,
9999
DiffViewStyle: user.DiffViewStyle,

‎services/user/update_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestUpdateUser(t *testing.T) {
6464
assert.Equal(t, opts.Visibility.Value(), user.Visibility)
6565
assert.Equal(t, opts.KeepActivityPrivate.Value(), user.KeepActivityPrivate)
6666
assert.Equal(t, opts.Language.Value(), user.Language)
67-
assert.Equal(t, opts.Theme.Value(), user.Theme)
67+
assert.Equal(t, opts.Theme.Value(), user.GetTheme(t.Context()))
6868
assert.Equal(t, opts.DiffViewStyle.Value(), user.DiffViewStyle)
6969
assert.Equal(t, opts.AllowCreateOrganization.Value(), user.AllowCreateOrganization)
7070
assert.Equal(t, opts.EmailNotificationsPreference.Value(), user.EmailNotificationsPreference)
@@ -84,7 +84,7 @@ func TestUpdateUser(t *testing.T) {
8484
assert.Equal(t, opts.Visibility.Value(), user.Visibility)
8585
assert.Equal(t, opts.KeepActivityPrivate.Value(), user.KeepActivityPrivate)
8686
assert.Equal(t, opts.Language.Value(), user.Language)
87-
assert.Equal(t, opts.Theme.Value(), user.Theme)
87+
assert.Equal(t, opts.Theme.Value(), user.GetTheme(t.Context()))
8888
assert.Equal(t, opts.DiffViewStyle.Value(), user.DiffViewStyle)
8989
assert.Equal(t, opts.AllowCreateOrganization.Value(), user.AllowCreateOrganization)
9090
assert.Equal(t, opts.EmailNotificationsPreference.Value(), user.EmailNotificationsPreference)

‎templates/admin/org/list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<tr>
5353
<td>{{.ID}}</td>
5454
<td>
55-
<a href="{{.HomeLink}}">{{if and (DefaultShowFullName ctx) .FullName}}{{.FullName}} ({{.Name}}){{else}}{{.Name}}{{end}}</a>
55+
<a href="{{.HomeLink}}">{{if and ((DefaultShowFullName ctx) ctx) .FullName}}{{.FullName}} ({{.Name}}){{else}}{{.Name}}{{end}}</a>
5656
{{if .Visibility.IsPrivate}}
5757
<span class="text gold">{{svg "octicon-lock"}}</span>
5858
{{end}}

‎templates/repo/commits_list.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="tw-flex">
1818
{{$userName := .Author.Name}}
1919
{{if .User}}
20-
{{if and .User.FullName DefaultShowFullName ctx}}
20+
{{if and .User.FullName (DefaultShowFullName ctx) ctx}}
2121
{{$userName = .User.FullName}}
2222
{{end}}
2323
{{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}<a class="muted author-wrapper" href="{{.User.HomeLink}}">{{$userName}}</a>

‎templates/repo/diff/blob_excerpt.tmpl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</div>
2525
</td>
2626
<td colspan="7" class="lines-code lines-code-old">
27-
{{- $inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale -}}
27+
{{- $inlineDiff := $.section.GetComputedInlineDiffFor ctx $line ctx.Locale -}}
2828
{{- template "repo/diff/section_code" dict "diff" $inlineDiff -}}
2929
</td>
3030
{{else}}
31-
{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}
31+
{{$inlineDiff := $.section.GetComputedInlineDiffFor ctx $line ctx.Locale}}
3232
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$.FileNameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
3333
<td class="lines-escape lines-escape-old">{{if and $line.LeftIdx $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
3434
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker=""></span>{{end}}</td>
@@ -80,7 +80,7 @@
8080
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$.FileNameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
8181
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$.FileNameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
8282
{{end}}
83-
{{$inlineDiff := $.section.GetComputedInlineDiffFor $line ctx.Locale}}
83+
{{$inlineDiff := $.section.GetComputedInlineDiffFor ctx $line ctx.Locale}}
8484
<td class="lines-escape">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
8585
<td class="lines-type-marker"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
8686
<td class="lines-code{{if (not $line.RightIdx)}} lines-code-old{{end}}"><code {{if $inlineDiff.EscapeStatus.Escaped}}class="code-inner has-escaped" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"{{else}}class="code-inner"{{end}}>{{$inlineDiff.Content}}</code></td>

‎templates/repo/diff/section_split.tmpl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
</button>
3636
{{end}}
3737
</div>
38-
</td>{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale}}
38+
</td>{{$inlineDiff := $section.GetComputedInlineDiffFor ctx $line ctx.Locale}}
3939
<td class="lines-escape lines-escape-old">{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}</td>
4040
<td colspan="6" class="lines-code lines-code-old">{{template "repo/diff/section_code" dict "diff" $inlineDiff}}</td>
4141
{{else if and (eq .GetType 3) $hasmatch}}{{/* DEL */}}
4242
{{$match := index $section.Lines $line.Match}}
43-
{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor $line ctx.Locale}}{{end}}
44-
{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor $match ctx.Locale}}{{end}}
43+
{{- $leftDiff := ""}}{{if $line.LeftIdx}}{{$leftDiff = $section.GetComputedInlineDiffFor ctx $line ctx.Locale}}{{end}}
44+
{{- $rightDiff := ""}}{{if $match.RightIdx}}{{$rightDiff = $section.GetComputedInlineDiffFor ctx $match ctx.Locale}}{{end}}
4545
<td class="lines-num lines-num-old del-code" data-line-num="{{$line.LeftIdx}}"><span rel="diff-{{$file.NameHash}}L{{$line.LeftIdx}}"></span></td>
4646
<td class="lines-escape del-code lines-escape-old">{{if $line.LeftIdx}}{{if $leftDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $leftDiff}}"></button>{{end}}{{end}}</td>
4747
<td class="lines-type-marker lines-type-marker-old del-code"><span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span></td>
@@ -73,7 +73,7 @@
7373
{{- end -}}
7474
</td>
7575
{{else}}
76-
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale}}
76+
{{$inlineDiff := $section.GetComputedInlineDiffFor ctx $line ctx.Locale}}
7777
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
7878
<td class="lines-escape lines-escape-old">{{if $line.LeftIdx}}{{if $inlineDiff.EscapeStatus.Escaped}}<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>{{end}}{{end}}</td>
7979
<td class="lines-type-marker lines-type-marker-old">{{if $line.LeftIdx}}<span class="tw-font-mono" data-type-marker="{{$line.GetLineTypeMarker}}"></span>{{end}}</td>

‎templates/repo/diff/section_unified.tmpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<td class="lines-num lines-num-old" data-line-num="{{if $line.LeftIdx}}{{$line.LeftIdx}}{{end}}"><span rel="{{if $line.LeftIdx}}diff-{{$file.NameHash}}L{{$line.LeftIdx}}{{end}}"></span></td>
4343
<td class="lines-num lines-num-new" data-line-num="{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}"><span rel="{{if $line.RightIdx}}diff-{{$file.NameHash}}R{{$line.RightIdx}}{{end}}"></span></td>
4444
{{end}}
45-
{{$inlineDiff := $section.GetComputedInlineDiffFor $line ctx.Locale -}}
45+
{{$inlineDiff := $section.GetComputedInlineDiffFor ctx $line ctx.Locale -}}
4646
<td class="lines-escape">
4747
{{- if $inlineDiff.EscapeStatus.Escaped -}}
4848
<button class="toggle-escape-button btn interact-bg" title="{{template "repo/diff/escape_title" dict "diff" $inlineDiff}}"></button>

0 commit comments

Comments
 (0)