Skip to content

Commit 61fcdd6

Browse files
HesterGHesterG
committed
use config to decide if show fullname in search
1 parent ae41379 commit 61fcdd6

File tree

7 files changed

+15
-19
lines changed

7 files changed

+15
-19
lines changed

‎routers/web/repo/setting_protected_branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func ProtectedBranchRules(ctx *context.Context) {
4040
return
4141
}
4242
ctx.Data["ProtectedBranches"] = rules
43-
ctx.Data["isShowFullName"] = setting.UI.DefaultShowFullName
4443

4544
ctx.HTML(http.StatusOK, tplBranches)
4645
}
@@ -153,6 +152,7 @@ func SettingsProtectedBranch(c *context.Context) {
153152
}
154153

155154
c.Data["Rule"] = rule
155+
c.Data["isShowFullName"] = setting.UI.DefaultShowFullName
156156
c.HTML(http.StatusOK, tplProtectedBranch)
157157
}
158158

‎templates/repo/issue/list.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<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>
135135
{{range .Posters}}
136136
<a class="{{if eq $.PosterID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{$.AssigneeID}}&poster={{.ID}}">
137-
{{avatar $.Context .}} {{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{$.isShowFullName}}{{.FullName}}{{end}}</span>
137+
{{avatar $.Context .}} {{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
138138
</a>
139139
{{end}}
140140
</div>
@@ -154,7 +154,7 @@
154154
<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>
155155
{{range .Assignees}}
156156
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&project={{$.ProjectID}}&assignee={{.ID}}&poster={{$.PosterID}}">
157-
{{avatar $.Context .}} {{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
157+
{{avatar $.Context .}} {{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
158158
</a>
159159
{{end}}
160160
</div>

‎templates/repo/issue/milestone_issues.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<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>
7878
{{range .Posters}}
7979
<a class="{{if eq $.PosterID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{$.AssigneeID}}&poster={{.ID}}">
80-
{{avatar $.Context .}} {{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
80+
{{avatar $.Context .}} {{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
8181
</a>
8282
{{end}}
8383
</div>
@@ -98,8 +98,8 @@
9898
{{range .Assignees}}
9999
<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{.ID}}&poster={{$.PosterID}}">
100100
{{avatar $.Context . 28 "gt-mr-2"}}
101-
{{.GetDisplayName}}
102-
<span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
101+
{{.Name}}
102+
{{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
103103
</a>
104104
{{end}}
105105
</div>

‎templates/repo/issue/new_form.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
<a class="item muted" href="#" data-id="{{.ID}}" data-id-selector="#assignee_{{.ID}}">
187187
<span class="octicon-check invisible">{{svg "octicon-check"}}</span>
188188
<span class="text">
189-
{{avatar $.Context . 28 "gt-mr-3"}}{{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
189+
{{avatar $.Context . 28 "gt-mr-3"}}{{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
190190
</span>
191191
</a>
192192
{{end}}

‎templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
<span class="octicon-check {{if not .Checked}}invisible{{end}}">{{svg "octicon-check"}}</span>
2828
<span class="text">
2929
{{avatar $.Context .User 28 "gt-mr-3"}}
30-
{{.User.GetDisplayName}}
31-
</span>
32-
<span class="text gt-hidden">
33-
{{if $.isShowFullName}}{{.User.Name}}{{else}}{{.User.FullName}}{{end}}
30+
{{.User.Name}}
3431
</span>
32+
{{if $.isShowFullName}}<span class="text" style="color: var(--color-text-light-2);">{{.User.FullName}}</span>{{end}}
3533
</a>
3634
{{end}}
3735
{{end}}
@@ -262,11 +260,9 @@
262260
<span class="octicon-check {{if not $checked}}invisible{{end}}">{{svg "octicon-check"}}</span>
263261
<span class="text">
264262
{{avatar $.Context . 28 "gt-mr-3"}}
265-
{{.GetDisplayName}}
266-
</span>
267-
<span class="text" style="color: var(--color-text-light-2);">
268-
{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}
263+
{{.Name}}
269264
</span>
265+
{{if $.isShowFullName}}<span class="text" style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
270266
</a>
271267
{{end}}
272268
</div>

‎templates/repo/settings/protected_branch.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
{{range .Users}}
5151
<div class="item" data-value="{{.ID}}">
5252
{{avatar $.Context . 28 "mini"}}
53-
{{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
53+
{{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
5454
</div>
5555
{{end}}
5656
</div>
@@ -102,7 +102,7 @@
102102
{{range .Users}}
103103
<div class="item" data-value="{{.ID}}">
104104
{{avatar $.Context . 28 "mini"}}
105-
{{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
105+
{{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
106106
</div>
107107
{{end}}
108108
</div>
@@ -182,7 +182,7 @@
182182
{{range .Users}}
183183
<div class="item" data-value="{{.ID}}">
184184
{{avatar $.Context . 28 "mini"}}
185-
{{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
185+
{{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
186186
</div>
187187
{{end}}
188188
</div>

‎templates/repo/settings/tags.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
{{range .Users}}
3838
<div class="item" data-value="{{.ID}}">
3939
{{avatar $.Context . 28 "mini"}}
40-
{{.GetDisplayName}} <span class="gt-hidden">{{if $.isShowFullName}}{{.Name}}{{else}}{{.FullName}}{{end}}</span>
40+
{{.Name}} {{if $.isShowFullName}}<span style="color: var(--color-text-light-2);">{{.FullName}}</span>{{end}}
4141
</div>
4242
{{end}}
4343
</div>

0 commit comments

Comments
 (0)