aniani/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-26 11:04:27 -04:00
Code

Fix some places which doesn't repsect org full name setting

Browse Source
This commit is contained in:
Lunny Xiao 2024-10-11 15:46:16 -07:00
parent 0fe5e2b08c
commit eefec9bcc7
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/admin/org/list.tmpl
View File

@ -52,7 +52,7 @@
<tr> <tr>
<td>{{.ID}}</td> <td>{{.ID}}</td>
<td> <td>
<a href="{{.HomeLink}}">{{.Name}}</a> <a href="{{.HomeLink}}">{{if and DefaultShowFullName .FullName}}{{.FullName}}({{.Name}}){{else}}{{.Name}}{{end}}</a>
{{if .Visibility.IsPrivate}} {{if .Visibility.IsPrivate}}
<span class="text gold">{{svg "octicon-lock"}}</span> <span class="text gold">{{svg "octicon-lock"}}</span>
{{end}} {{end}}

1
templates/base/head_script.tmpl
View File

@ -13,6 +13,7 @@ If you introduce mistakes in it, Gitea JavaScript code wouldn't run correctly.
assetVersionEncoded: encodeURIComponent('{{AssetVersion}}'), // will be used in URL construction directly assetVersionEncoded: encodeURIComponent('{{AssetVersion}}'), // will be used in URL construction directly
assetUrlPrefix: '{{AssetUrlPrefix}}', assetUrlPrefix: '{{AssetUrlPrefix}}',
runModeIsProd: {{.RunModeIsProd}}, runModeIsProd: {{.RunModeIsProd}},
defaultShowFullName: {{DefaultShowFullName}},
customEmojis: {{CustomEmojis}}, customEmojis: {{CustomEmojis}},
csrfToken: '{{.CsrfToken}}', csrfToken: '{{.CsrfToken}}',
pageData: {{.PageData}}, pageData: {{.PageData}},

2
templates/user/dashboard/repolist.tmpl
View File

@ -45,7 +45,7 @@ data.teamId = {{.Team.ID}};
{{end}} {{end}}
{{if not .ContextUser.IsOrganization}} {{if not .ContextUser.IsOrganization}}
data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}, 'org_visibility': {{.Visibility}}},{{end}}]; data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'full_name': {{.FullName}}, 'num_repos': {{.NumRepos}}, 'org_visibility': {{.Visibility}}},{{end}}];
data.isOrganization = false; data.isOrganization = false;
data.organizationsTotalCount = {{.UserOrgsCount}}; data.organizationsTotalCount = {{.UserOrgsCount}};
data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}}; data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}};

5
web_src/js/components/DashboardRepoList.vue
View File

@ -4,7 +4,7 @@ import $ from 'jquery';
import {SvgIcon} from '../svg.ts'; import {SvgIcon} from '../svg.ts';
import {GET} from '../modules/fetch.ts'; import {GET} from '../modules/fetch.ts';
const {appSubUrl, assetUrlPrefix, pageData} = window.config; const {appSubUrl, assetUrlPrefix, pageData, defaultShowFullName} = window.config;
// make sure this matches templates/repo/commit_status.tmpl // make sure this matches templates/repo/commit_status.tmpl
const commitStatus = { const commitStatus = {
@ -64,6 +64,7 @@ const sfc = {
canCreateOrganization: false, canCreateOrganization: false,
organizationsTotalCount: 0, organizationsTotalCount: 0,
organizationId: 0, organizationId: 0,
defaultShowFullName,
subUrl: appSubUrl, subUrl: appSubUrl,
...pageData.dashboardRepoList, ...pageData.dashboardRepoList,
@ -471,7 +472,7 @@ export default sfc; // activate the IDE's Vue plugin
<li class="tw-flex tw-items-center tw-py-2" v-for="org in organizations" :key="org.name"> <li class="tw-flex tw-items-center tw-py-2" v-for="org in organizations" :key="org.name">
<a class="repo-list-link muted" :href="subUrl + '/' + encodeURIComponent(org.name)"> <a class="repo-list-link muted" :href="subUrl + '/' + encodeURIComponent(org.name)">
<svg-icon name="octicon-organization" :size="16" class-name="repo-list-icon"/> <svg-icon name="octicon-organization" :size="16" class-name="repo-list-icon"/>
<div class="text truncate">{{ org.name }}</div> <div class="text truncate">{{ defaultShowFullName && org.full_name ? org.full_name : org.name }}</div>
<div><!-- div to prevent underline of label on hover --> <div><!-- div to prevent underline of label on hover -->
<span class="ui tiny basic label" v-if="org.org_visibility !== 'public'"> <span class="ui tiny basic label" v-if="org.org_visibility !== 'public'">
{{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }} {{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }}

1
web_src/js/types.ts
View File

@ -12,6 +12,7 @@ export type Config = {
assetVersionEncoded: string, assetVersionEncoded: string,
assetUrlPrefix: string, assetUrlPrefix: string,
runModeIsProd: boolean, runModeIsProd: boolean,
defaultShowFullName: boolean,
customEmojis: Record<string, string>, customEmojis: Record<string, string>,
csrfToken: string, csrfToken: string,
pageData: Record<string, any>, pageData: Record<string, any>,