Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Automatically select the org when click create repo from org dashboard (#24325)

Browse source 
![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}`
This commit is contained in:
yp05327 2023-04-26 11:25:29 +09:00 committed by GitHub
parent 2ec2d06531
commit 5f21e0f8eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
templates/user/dashboard/repolist.tmpl
View file

@ -44,8 +44,10 @@ data.teamId = {{.Team.ID}};
{{if not .ContextUser.IsOrganization}} {{if not .ContextUser.IsOrganization}}
data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}},{{end}}]; data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}},{{end}}];
data.isOrganization = false; data.isOrganization = false;
data.organizationsTotalCount = {{.UserOrgsCount}} data.organizationsTotalCount = {{.UserOrgsCount}};
data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}} data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}};
{{else}}
data.organizationId = {{.ContextUser.ID}};
{{end}} {{end}}
window.config.pageData.dashboardRepoList = data; window.config.pageData.dashboardRepoList = data;

3
web_src/js/components/DashboardRepoList.vue
View file

@ -10,7 +10,7 @@
{{ textMyRepos }} {{ textMyRepos }}
<span class="ui grey label gt-ml-3">{{ reposTotalCount }}</span> <span class="ui grey label gt-ml-3">{{ reposTotalCount }}</span>
</div> </div>
<a :href="subUrl + '/repo/create'" :data-tooltip-content="textNewRepo"> <a :href="subUrl + '/repo/create' + (isOrganization ? '?org=' + organizationId : '')" :data-tooltip-content="textNewRepo">
<svg-icon name="octicon-plus"/> <svg-icon name="octicon-plus"/>
<span class="sr-only">{{ textNewRepo }}</span> <span class="sr-only">{{ textNewRepo }}</span>
</a> </a>
@ -199,6 +199,7 @@ const sfc = {
isOrganization: true, isOrganization: true,
canCreateOrganization: false, canCreateOrganization: false,
organizationsTotalCount: 0, organizationsTotalCount: 0,
organizationId: 0,
subUrl: appSubUrl, subUrl: appSubUrl,
...pageData.dashboardRepoList, ...pageData.dashboardRepoList,