Skip to content

Commit 1b7031c

Browse files
GiteaBotlunny
andauthored
Fix some places which doesn't repsect org full name setting (#32243) (#32550)
Backport #32243 by @lunny Partially fix #31345 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent 673fee4 commit 1b7031c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

templates/admin/org/list.tmpl

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

templates/user/dashboard/repolist.tmpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ data.teamId = {{.Team.ID}};
4545
{{end}}
4646

4747
{{if not .ContextUser.IsOrganization}}
48-
data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}, 'org_visibility': {{.Visibility}}},{{end}}];
48+
data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'full_name': {{.FullName}}, 'num_repos': {{.NumRepos}}, 'org_visibility': {{.Visibility}}},{{end}}];
4949
data.isOrganization = false;
5050
data.organizationsTotalCount = {{.UserOrgsCount}};
5151
data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}};

web_src/js/components/DashboardRepoList.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ export default sfc; // activate the IDE's Vue plugin
471471
<li class="tw-flex tw-items-center tw-py-2" v-for="org in organizations" :key="org.name">
472472
<a class="repo-list-link muted" :href="subUrl + '/' + encodeURIComponent(org.name)">
473473
<svg-icon name="octicon-organization" :size="16" class-name="repo-list-icon"/>
474-
<div class="text truncate">{{ org.name }}</div>
474+
<div class="text truncate">{{ org.full_name ? `${org.full_name} (${org.name})` : org.name }}</div>
475475
<div><!-- div to prevent underline of label on hover -->
476476
<span class="ui tiny basic label" v-if="org.org_visibility !== 'public'">
477477
{{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }}

0 commit comments

Comments
 (0)