Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor authors dropdown (send get request from frontend to avoid long wait time) #23890

Merged
merged 91 commits into from
Apr 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
2b37b10
save changes
HesterG Mar 27, 2023
c7ae8bf
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 28, 2023
b737121
save
HesterG Mar 28, 2023
0840d53
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 28, 2023
62c030c
save changes
HesterG Mar 29, 2023
0cc99b1
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 29, 2023
9601ec6
move position of get posters
HesterG Mar 29, 2023
5d01552
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 29, 2023
5c55c62
comment
HesterG Mar 29, 2023
0a28191
lints
HesterG Mar 29, 2023
cc66388
remove console
HesterG Mar 29, 2023
bb26b17
save changes for dropdown
HesterG Mar 29, 2023
886543e
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 29, 2023
4634fa4
test native
HesterG Mar 29, 2023
e94588f
fomantic dropdown demo
HesterG Mar 29, 2023
f45d666
comment
HesterG Mar 29, 2023
37e82fe
comment
HesterG Mar 29, 2023
d0c121a
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 30, 2023
fefb59e
use dropdown setting
HesterG Mar 30, 2023
e752acc
change posters to milestone
HesterG Mar 30, 2023
7e9c9f1
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 30, 2023
d352b42
remove console logs
HesterG Mar 30, 2023
c6c485d
remove test
HesterG Mar 30, 2023
823bcf7
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 30, 2023
e619f6a
remove comments
HesterG Mar 30, 2023
d30b3b4
add aria
HesterG Mar 30, 2023
f1e53c2
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 31, 2023
ad83d13
onresponse demo
HesterG Mar 31, 2023
3abfabb
demo
HesterG Mar 31, 2023
f096140
modify
HesterG Mar 31, 2023
5259ae9
save for now
HesterG Mar 31, 2023
cbde0de
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 31, 2023
02643be
remove onresponse demo
HesterG Mar 31, 2023
9322b30
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 31, 2023
e08561c
fullname logic
HesterG Mar 31, 2023
7e7868c
remove unnecessary
HesterG Mar 31, 2023
33df17b
comments
HesterG Mar 31, 2023
03a9654
comments
HesterG Mar 31, 2023
4a27cd1
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Mar 31, 2023
c168591
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Apr 3, 2023
88dbd4f
fix pulls param
HesterG Apr 3, 2023
1fa5f30
remove print
HesterG Apr 3, 2023
8d41150
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Apr 3, 2023
87e55e1
comments
HesterG Apr 3, 2023
547b34a
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Apr 3, 2023
7eec9e7
use native for now
HesterG Apr 3, 2023
8e8ab90
add tooltip
HesterG Apr 3, 2023
a9d4e01
tooltip add to milestone issues
HesterG Apr 3, 2023
c1f82df
reset input
HesterG Apr 3, 2023
74f5a8f
lint
HesterG Apr 3, 2023
1192718
comment
HesterG Apr 3, 2023
5a6d303
add missing id to milestone issues
HesterG Apr 3, 2023
b184a07
move .length
HesterG Apr 3, 2023
4fb76f5
move .length
HesterG Apr 3, 2023
23831e5
fix lint
HesterG Apr 3, 2023
2baaa7f
only get necesssary columns from database
HesterG Apr 3, 2023
bb97213
use builder.like
HesterG Apr 3, 2023
3cda924
remove autocomplete
HesterG Apr 3, 2023
1884ffd
Merge branch 'go-gitea:main' into get-posters-fe
HesterG Apr 4, 2023
e670baa
change orderby
HesterG Apr 4, 2023
cea1970
avoid using same name
HesterG Apr 4, 2023
75ec73a
Merge branch 'main' into get-posters-fe
HesterG Apr 4, 2023
76dc49d
update tooltip text
HesterG Apr 4, 2023
4065249
refactor
wxiaoguang Apr 4, 2023
bebc99a
use aria framework to provide autocomplete=off
wxiaoguang Apr 4, 2023
5d29c6e
refactor
wxiaoguang Apr 4, 2023
be6791f
refactor
wxiaoguang Apr 4, 2023
8daf6bd
more fixes
wxiaoguang Apr 4, 2023
aa878d5
clean up
wxiaoguang Apr 4, 2023
454091f
clean up
wxiaoguang Apr 4, 2023
dbbeb49
fine tune
wxiaoguang Apr 4, 2023
2702687
fix lint
wxiaoguang Apr 4, 2023
3e6451a
fix lint
wxiaoguang Apr 4, 2023
1d396ad
modify dom css for options, remove data-selected-user-id, add throttle
HesterG Apr 4, 2023
0851d20
Merge branch 'main' into get-posters-fe
HesterG Apr 4, 2023
28594c8
add aria-hidden to avatar img, use DOM operation instead of for loop
wxiaoguang Apr 4, 2023
8481c35
use onshow to show default options and add active class to selected o…
HesterG Apr 4, 2023
eaa90b8
respect selected user id
wxiaoguang Apr 4, 2023
ea440c2
always add self
wxiaoguang Apr 4, 2023
e0fba04
show self on top
wxiaoguang Apr 4, 2023
ca8b857
show self on top
wxiaoguang Apr 4, 2023
aa8dca3
revert mistakes
wxiaoguang Apr 4, 2023
6789a61
patch fomantic api bug
wxiaoguang Apr 4, 2023
c0cd3a4
fix lint
wxiaoguang Apr 4, 2023
61c0d9d
fine tune avatar size
wxiaoguang Apr 4, 2023
4811e8a
fine tune avatar size
wxiaoguang Apr 4, 2023
288f301
fix issue sidebar avatar
wxiaoguang Apr 4, 2023
5bfd0b0
Update templates/repo/issue/list.tmpl
silverwind Apr 4, 2023
37141e4
Update templates/repo/issue/milestone_issues.tmpl
silverwind Apr 4, 2023
cc4a1fa
add comment for adding self
wxiaoguang Apr 6, 2023
c1865b9
Merge branch 'main' into get-posters-fe
lunny Apr 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions models/repo/user_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,25 @@ func GetReviewers(ctx context.Context, repo *Repository, doerID, posterID int64)
return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users)
}

// GetIssuePosters returns all users that have authored an issue/pull request for the given repository
func GetIssuePosters(ctx context.Context, repo *Repository, isPull bool) ([]*user_model.User, error) {
users := make([]*user_model.User, 0, 8)
// GetIssuePostersWithSearch returns users with limit of 30 whose username started with prefix that have authored an issue/pull request for the given repository
// If isShowFullName is set to true, also include full name prefix search
func GetIssuePostersWithSearch(ctx context.Context, repo *Repository, isPull bool, search string, isShowFullName bool) ([]*user_model.User, error) {
users := make([]*user_model.User, 0, 30)
var prefixCond builder.Cond = builder.Like{"name", search + "%"}
if isShowFullName {
prefixCond = prefixCond.Or(builder.Like{"full_name", "%" + search + "%"})
}

cond := builder.In("`user`.id",
builder.Select("poster_id").From("issue").Where(
builder.Eq{"repo_id": repo.ID}.
And(builder.Eq{"is_pull": isPull}),
).GroupBy("poster_id"),
)
return users, db.GetEngine(ctx).Where(cond).OrderBy(user_model.GetOrderByName()).Find(&users)
).GroupBy("poster_id")).And(prefixCond)

return users, db.GetEngine(ctx).
Where(cond).
Cols("id", "name", "full_name", "avatar", "avatar_email", "use_custom_avatar").
OrderBy("name").
Limit(30).
Find(&users)
}
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,7 @@ delete_preexisting = Delete pre-existing files
delete_preexisting_content = Delete files in %s
delete_preexisting_success = Deleted unadopted files in %s
blame_prior = View blame prior to this change
author_search_tooltip = Shows a maximum of 30 users

transfer.accept = Accept Transfer
transfer.accept_desc = Transfer to "%s"
Expand Down
23 changes: 23 additions & 0 deletions routers/web/repo/helper.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package repo

import (
"sort"

"code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/context"
)

func makeSelfOnTop(ctx *context.Context, users []*user.User) []*user.User {
if ctx.Doer != nil {
sort.Slice(users, func(i, j int) bool {
if users[i].ID == users[j].ID {
return false
}
return users[i].ID == ctx.Doer.ID // if users[i] is self, put it before others, so less=true
})
}
return users
}
27 changes: 27 additions & 0 deletions routers/web/repo/helper_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2023 The Gitea Authors. All rights reserved.
// SPDX-License-Identifier: MIT

package repo

import (
"testing"

"code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/context"

"github.com/stretchr/testify/assert"
)

func TestMakeSelfOnTop(t *testing.T) {
users := makeSelfOnTop(&context.Context{}, []*user.User{{ID: 2}, {ID: 1}})
assert.Len(t, users, 2)
assert.EqualValues(t, 2, users[0].ID)

users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 1}}, []*user.User{{ID: 2}, {ID: 1}})
assert.Len(t, users, 2)
assert.EqualValues(t, 1, users[0].ID)

users = makeSelfOnTop(&context.Context{Doer: &user.User{ID: 2}}, []*user.User{{ID: 2}, {ID: 1}})
assert.Len(t, users, 2)
assert.EqualValues(t, 2, users[0].ID)
}
59 changes: 49 additions & 10 deletions routers/web/repo/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -303,17 +303,12 @@ func issues(ctx *context.Context, milestoneID, projectID int64, isPullOption uti
ctx.Data["CommitStatuses"] = commitStatuses

// Get assignees.
ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, repo)
assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo)
if err != nil {
ctx.ServerError("GetAssignees", err)
return
}

ctx.Data["Posters"], err = repo_model.GetIssuePosters(ctx, repo, isPullOption.IsTrue())
if err != nil {
ctx.ServerError("GetIssuePosters", err)
ctx.ServerError("GetRepoAssignees", err)
return
}
ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)

handleTeamMentions(ctx)
if ctx.Written() {
Expand Down Expand Up @@ -479,11 +474,12 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.R
return
}

ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, repo)
assigneeUsers, err := repo_model.GetRepoAssignees(ctx, repo)
if err != nil {
ctx.ServerError("GetAssignees", err)
ctx.ServerError("GetRepoAssignees", err)
return
}
ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)

handleTeamMentions(ctx)
}
Expand Down Expand Up @@ -3354,3 +3350,46 @@ func handleTeamMentions(ctx *context.Context) {
ctx.Data["MentionableTeamsOrg"] = ctx.Repo.Owner.Name
ctx.Data["MentionableTeamsOrgAvatar"] = ctx.Repo.Owner.AvatarLink(ctx)
}

type userSearchInfo struct {
UserID int64 `json:"user_id"`
UserName string `json:"username"`
AvatarLink string `json:"avatar_link"`
FullName string `json:"full_name"`
}

type userSearchResponse struct {
Results []*userSearchInfo `json:"results"`
}

// IssuePosters get posters for current repo's issues/pull requests
func IssuePosters(ctx *context.Context) {
repo := ctx.Repo.Repository
isPullList := ctx.Params(":type") == "pulls"
search := strings.TrimSpace(ctx.FormString("q"))
posters, err := repo_model.GetIssuePostersWithSearch(ctx, repo, isPullList, search, setting.UI.DefaultShowFullName)
if err != nil {
ctx.JSON(http.StatusInternalServerError, err)
return
}

if search == "" && ctx.Doer != nil {
// the returned posters slice only contains limited number of users,
// to make the current user (doer) can quickly filter their own issues, always add doer to the posters slice
if !util.SliceContainsFunc(posters, func(user *user_model.User) bool { return user.ID == ctx.Doer.ID }) {
lunny marked this conversation as resolved.
Show resolved Hide resolved
posters = append(posters, ctx.Doer)
}
}

posters = makeSelfOnTop(ctx, posters)

resp := &userSearchResponse{}
resp.Results = make([]*userSearchInfo, len(posters))
for i, user := range posters {
resp.Results[i] = &userSearchInfo{UserID: user.ID, UserName: user.Name, AvatarLink: user.AvatarLink(ctx)}
if setting.UI.DefaultShowFullName {
resp.Results[i].FullName = user.FullName
}
}
ctx.JSON(http.StatusOK, resp)
}
7 changes: 5 additions & 2 deletions routers/web/repo/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -792,10 +792,13 @@ func ViewPullFiles(ctx *context.Context) {

setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)

if ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository); err != nil {
ctx.ServerError("GetAssignees", err)
assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository)
if err != nil {
ctx.ServerError("GetRepoAssignees", err)
return
}
ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)

handleTeamMentions(ctx)
if ctx.Written() {
return
Expand Down
12 changes: 6 additions & 6 deletions routers/web/repo/release.go
Original file line number Diff line number Diff line change
Expand Up @@ -333,13 +333,12 @@ func NewRelease(ctx *context.Context) {
}
}
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
var err error
// Get assignees.
ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository)
assigneeUsers, err := repo_model.GetRepoAssignees(ctx, ctx.Repo.Repository)
if err != nil {
ctx.ServerError("GetAssignees", err)
ctx.ServerError("GetRepoAssignees", err)
return
}
ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)

upload.AddUploadContext(ctx, "release")
ctx.HTML(http.StatusOK, tplReleaseNew)
Expand Down Expand Up @@ -496,11 +495,12 @@ func EditRelease(ctx *context.Context) {
ctx.Data["attachments"] = rel.Attachments

// Get assignees.
ctx.Data["Assignees"], err = repo_model.GetRepoAssignees(ctx, rel.Repo)
assigneeUsers, err := repo_model.GetRepoAssignees(ctx, rel.Repo)
if err != nil {
ctx.ServerError("GetAssignees", err)
ctx.ServerError("GetRepoAssignees", err)
return
}
ctx.Data["Assignees"] = makeSelfOnTop(ctx, assigneeUsers)

ctx.HTML(http.StatusOK, tplReleaseNew)
}
Expand Down
5 changes: 4 additions & 1 deletion routers/web/web.go
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,10 @@ func RegisterRoutes(m *web.Route) {

m.Group("/{username}/{reponame}", func() {
m.Group("", func() {
m.Get("/{type:issues|pulls}", repo.Issues)
m.Group("/{type:issues|pulls}", func() {
m.Get("", repo.Issues)
m.Get("/posters", repo.IssuePosters)
})
m.Get("/{type:issues|pulls}/{index}", repo.ViewIssue)
m.Group("/{type:issues|pulls}/{index}/content-history", func() {
m.Get("/overview", repo.GetContentHistoryOverview)
Expand Down
19 changes: 9 additions & 10 deletions templates/repo/issue/list.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository">
<div role="main" aria-label="{{.Title}}" class="page-content repository issue-list">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui three column grid issue-list-headers">
Expand Down Expand Up @@ -117,7 +117,11 @@
</div>

<!-- Author -->
<div class="ui {{if not .Posters}}disabled{{end}} dropdown jump item">
<div class="ui dropdown jump item user-remote-search" data-tooltip-content="{{.locale.Tr "repo.author_search_tooltip"}}"
data-search-url="{{$.Link}}/posters"
data-selected-user-id="{{$.PosterID}}"
data-action-jump-url="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={user_id}"
>
<span class="text">
{{.locale.Tr "repo.issues.filter_poster"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
Expand All @@ -127,12 +131,7 @@
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_poster"}}">
</div>
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a>
{{range .Posters}}
<a class="{{if eq $.PosterID .ID}}active selected{{end}} item gt-df" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{.ID}}">
{{avatar $.Context .}}{{template "repo/search_name" .}}
</a>
{{end}}
<a class="item" data-value="0">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a>
</div>
</div>

Expand All @@ -150,7 +149,7 @@
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>
{{range .Assignees}}
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item gt-df" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}">
{{avatar $.Context .}}{{template "repo/search_name" .}}
{{avatar $.Context . 20}}{{template "repo/search_name" .}}
</a>
{{end}}
</div>
Expand Down Expand Up @@ -299,7 +298,7 @@
</div>
{{range .Assignees}}
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/assignee">
{{avatar $.Context .}} {{.GetDisplayName}}
{{avatar $.Context . 20}} {{.GetDisplayName}}
</div>
{{end}}
</div>
Expand Down
19 changes: 9 additions & 10 deletions templates/repo/issue/milestone_issues.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content repository">
<div role="main" aria-label="{{.Title}}" class="page-content repository milestone-issue-list">
{{template "repo/header" .}}
<div class="ui container">
<div class="ui two column stackable grid">
Expand Down Expand Up @@ -71,7 +71,11 @@
</div>

<!-- Author -->
<div class="ui {{if not .Posters}}disabled{{end}} dropdown jump item">
<div class="ui dropdown jump item user-remote-search" data-tooltip-content="{{.locale.Tr "repo.author_search_tooltip"}}"
data-search-url="{{$.RepoLink}}/issues/posters"
data-selected-user-id="{{$.PosterID}}"
data-action-jump-url="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{$.AssigneeID}}&poster={user_id}"
>
<span class="text">
{{.locale.Tr "repo.issues.filter_poster"}}
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
Expand All @@ -81,12 +85,7 @@
<i class="icon gt-df gt-ac gt-jc">{{svg "octicon-search" 16}}</i>
<input type="text" placeholder="{{.locale.Tr "repo.issues.filter_poster"}}">
</div>
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a>
{{range .Posters}}
<a class="{{if eq $.PosterID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{.ID}}">
{{avatar $.Context .}}{{template "repo/search_name" .}}
</a>
{{end}}
<a class="item" data-value="0">{{.locale.Tr "repo.issues.filter_poster_no_select"}}</a>
</div>
</div>

Expand All @@ -104,7 +103,7 @@
<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&poster={{$.PosterID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>
{{range .Assignees}}
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{.ID}}&poster={{$.PosterID}}">
{{avatar $.Context . 28 "gt-mr-2"}}{{template "repo/search_name" .}}
{{avatar $.Context . 20}}{{template "repo/search_name" .}}
</a>
{{end}}
</div>
Expand Down Expand Up @@ -190,7 +189,7 @@
</div>
{{range .Assignees}}
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/assignee">
{{avatar $.Context . 28 "gt-mr-2"}}
{{avatar $.Context . 20}}
{{.GetDisplayName}}
</div>
{{end}}
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content/sidebar.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
{{end}}
<span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span>
<span class="text">
{{avatar $.Context . 28 "gt-mr-3"}}{{template "repo/search_name" .}}
{{avatar $.Context . 20 "gt-mr-3"}}{{template "repo/search_name" .}}
</span>
</a>
{{end}}
Expand Down
4 changes: 2 additions & 2 deletions web_src/css/repository.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@
max-height: 500px;
}

.repository .metas .ui.list.assignees .icon {
line-height: 2em;
.repository .metas .ui.list.assignees .item {
line-height: 2.5em;
}

.repository .metas .ui.list.assignees .teamavatar {
Expand Down
Loading