Skip to content

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

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Nov 18, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eefec9b
Fix some places which doesn't repsect org full name setting
lunny Oct 11, 2024
a60fce5
follow wxiaoguang's suggestion
lunny Nov 6, 2024
506d145
Merge branch 'main' into lunny/respsect_org_fullname
lunny Nov 6, 2024
ca7bac4
Remove unnecessary code
lunny Nov 6, 2024
d8c9044
Add space between full name and name
lunny Nov 6, 2024
422a6bd
Merge branch 'main' into lunny/respsect_org_fullname
lunny Nov 14, 2024
198a1a5
Merge branch 'main' into lunny/respsect_org_fullname
GiteaBot Nov 18, 2024
56936ad
Merge branch 'main' into lunny/respsect_org_fullname
GiteaBot Nov 18, 2024
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
2 changes: 1 addition & 1 deletion templates/admin/org/list.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<tr>
<td>{{.ID}}</td>
<td>
<a href="{{.HomeLink}}">{{.Name}}</a>
<a href="{{.HomeLink}}">{{if and DefaultShowFullName .FullName}}{{.FullName}}({{.Name}}){{else}}{{.Name}}{{end}}</a>
{{if .Visibility.IsPrivate}}
<span class="text gold">{{svg "octicon-lock"}}</span>
{{end}}
Expand Down
1 change: 1 addition & 0 deletions templates/base/head_script.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
assetUrlPrefix: '{{AssetUrlPrefix}}',
runModeIsProd: {{.RunModeIsProd}},
defaultShowFullName: {{DefaultShowFullName}},
customEmojis: {{CustomEmojis}},
csrfToken: '{{.CsrfToken}}',
pageData: {{.PageData}},
Expand Down
2 changes: 1 addition & 1 deletion templates/user/dashboard/repolist.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ data.teamId = {{.Team.ID}};
{{end}}

{{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.organizationsTotalCount = {{.UserOrgsCount}};
data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}};
Expand Down
5 changes: 3 additions & 2 deletions web_src/js/components/DashboardRepoList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import $ from 'jquery';
import {SvgIcon} from '../svg.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
const commitStatus = {
Expand Down Expand Up @@ -64,6 +64,7 @@ const sfc = {
canCreateOrganization: false,
organizationsTotalCount: 0,
organizationId: 0,
defaultShowFullName,

subUrl: appSubUrl,
...pageData.dashboardRepoList,
Expand Down Expand Up @@ -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">
<a class="repo-list-link muted" :href="subUrl + '/' + encodeURIComponent(org.name)">
<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 -->
<span class="ui tiny basic label" v-if="org.org_visibility !== 'public'">
{{ org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate }}
Expand Down
1 change: 1 addition & 0 deletions web_src/js/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type Config = {
assetVersionEncoded: string,
assetUrlPrefix: string,
runModeIsProd: boolean,
defaultShowFullName: boolean,
customEmojis: Record<string, string>,
csrfToken: string,
pageData: Record<string, any>,
Expand Down
Loading