From 2e4471c6f591aea75b9f269f5345ac05f5f7bd06 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Tue, 11 Jul 2023 05:21:35 +0000 Subject: [PATCH 1/5] fix --- options/locale/locale_en-US.ini | 1 + routers/web/repo/pull.go | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index c4c9d32e1d4ac..5277815ddc44f 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -935,6 +935,7 @@ fork_from = Fork From already_forked = You've already forked %s fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. +no_fork_user = No user can fork this repo. use_template = Use this template clone_in_vsc = Clone in VS Code download_zip = Download ZIP diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 1b68ef352a4ef..6e4c5fef3f177 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -174,6 +174,12 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { ctx.Data["ContextUser"] = ctx.Doer } else if len(orgs) > 0 { ctx.Data["ContextUser"] = orgs[0] + } else { + msg := ctx.Tr("repo.no_fork_user") + ctx.Data["Flash"] = ctx.Flash + ctx.Flash.Error(msg) + ctx.Data["CanForkRepo"] = false + return nil } return forkRepo From 9ab241f8024971ddacca5b6ef7e28fc031212c1f Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 12 Jul 2023 10:14:28 +0900 Subject: [PATCH 2/5] Update options/locale/locale_en-US.ini Co-authored-by: silverwind --- options/locale/locale_en-US.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 5277815ddc44f..901f26440bfe8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -935,7 +935,7 @@ fork_from = Fork From already_forked = You've already forked %s fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. -no_fork_user = No user can fork this repo. +fork_not_possible = This repository can not be forked. use_template = Use this template clone_in_vsc = Clone in VS Code download_zip = Download ZIP From abbddd8e4ecc976cdfbf3a1e81bc1ec8d96c8a00 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 12 Jul 2023 10:14:33 +0900 Subject: [PATCH 3/5] Update routers/web/repo/pull.go Co-authored-by: silverwind --- routers/web/repo/pull.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 6e4c5fef3f177..faf5d7d3eb12e 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -175,7 +175,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { } else if len(orgs) > 0 { ctx.Data["ContextUser"] = orgs[0] } else { - msg := ctx.Tr("repo.no_fork_user") + msg := ctx.Tr("repo.fork_not_possible") ctx.Data["Flash"] = ctx.Flash ctx.Flash.Error(msg) ctx.Data["CanForkRepo"] = false From 83bb241a238adfb2117e684d105ff3ca2b66328b Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Wed, 12 Jul 2023 01:23:16 +0000 Subject: [PATCH 4/5] improve error info --- options/locale/locale_en-US.ini | 3 ++- routers/web/repo/pull.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 901f26440bfe8..21dcfe850893e 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -935,7 +935,8 @@ fork_from = Fork From already_forked = You've already forked %s fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. -fork_not_possible = This repository can not be forked. +fork_not_possible = This repository can not be forked: %s +fork_error_no_valid_owners = No valid owners. use_template = Use this template clone_in_vsc = Clone in VS Code download_zip = Download ZIP diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index faf5d7d3eb12e..319253aa27086 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -175,7 +175,8 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { } else if len(orgs) > 0 { ctx.Data["ContextUser"] = orgs[0] } else { - msg := ctx.Tr("repo.fork_not_possible") + errMsg := ctx.Tr("repo.fork_error_no_valid_owners") + msg := ctx.Tr("repo.fork_not_possible", errMsg) ctx.Data["Flash"] = ctx.Flash ctx.Flash.Error(msg) ctx.Data["CanForkRepo"] = false From 38fd61d1da0b583d6b5c53659857b054447a2b01 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Thu, 13 Jul 2023 01:15:37 +0000 Subject: [PATCH 5/5] combine --- options/locale/locale_en-US.ini | 3 +-- routers/web/repo/pull.go | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 21dcfe850893e..8c7990e0d4dea 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -935,8 +935,7 @@ fork_from = Fork From already_forked = You've already forked %s fork_to_different_account = Fork to a different account fork_visibility_helper = The visibility of a forked repository cannot be changed. -fork_not_possible = This repository can not be forked: %s -fork_error_no_valid_owners = No valid owners. +fork_no_valid_owners = This repository can not be forked because there are no valid owners. use_template = Use this template clone_in_vsc = Clone in VS Code download_zip = Download ZIP diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go index 319253aa27086..505e1424cd119 100644 --- a/routers/web/repo/pull.go +++ b/routers/web/repo/pull.go @@ -175,8 +175,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository { } else if len(orgs) > 0 { ctx.Data["ContextUser"] = orgs[0] } else { - errMsg := ctx.Tr("repo.fork_error_no_valid_owners") - msg := ctx.Tr("repo.fork_not_possible", errMsg) + msg := ctx.Tr("repo.fork_no_valid_owners") ctx.Data["Flash"] = ctx.Flash ctx.Flash.Error(msg) ctx.Data["CanForkRepo"] = false