From 5f21e0f8eb66791fc86c07baac80b485fd5965fc Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 26 Apr 2023 11:25:29 +0900 Subject: [PATCH] Automatically select the org when click create repo from org dashboard (#24325) ![image](https://user-images.githubusercontent.com/18380374/234209941-d661b07f-e963-427b-a673-78c46043a792.png) In org dashboard, the create repo link will be `repo/create?org={orgId}` --- templates/user/dashboard/repolist.tmpl | 6 ++++-- web_src/js/components/DashboardRepoList.vue | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 0a8f427f9..20638aab4 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -44,8 +44,10 @@ data.teamId = {{.Team.ID}}; {{if not .ContextUser.IsOrganization}} data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}},{{end}}]; data.isOrganization = false; -data.organizationsTotalCount = {{.UserOrgsCount}} -data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}} +data.organizationsTotalCount = {{.UserOrgsCount}}; +data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}}; +{{else}} +data.organizationId = {{.ContextUser.ID}}; {{end}} window.config.pageData.dashboardRepoList = data; diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 1af53aac9..33b312aa6 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -10,7 +10,7 @@ {{ textMyRepos }} {{ reposTotalCount }} - + {{ textNewRepo }} @@ -199,6 +199,7 @@ const sfc = { isOrganization: true, canCreateOrganization: false, organizationsTotalCount: 0, + organizationId: 0, subUrl: appSubUrl, ...pageData.dashboardRepoList,