From d12f545c7720ad4e1feebe3d4b9efd4fdffb1602 Mon Sep 17 00:00:00 2001 From: hiifong Date: Thu, 6 Jul 2023 23:38:21 +0800 Subject: [PATCH 1/9] Also update the repo's owner_name when only the apitalization of username changes --- routers/web/org/setting.go | 1 - services/user/user.go | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index b5653160a26d..553993667b41 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -89,7 +89,6 @@ func SettingsPost(ctx *context.Context) { // reset ctx.org.OrgLink with new name ctx.Org.OrgLink = setting.AppSubURL + "/org/" + url.PathEscape(form.Name) log.Trace("Organization name changed: %s -> %s", org.Name, form.Name) - nameChanged = false } // In case it's just a case change. diff --git a/services/user/user.go b/services/user/user.go index e0815bd86079..682580ba5034 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -58,6 +58,9 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err u.Name = oldUserName return err } + if err := repo_model.UpdateRepositoryOwnerName(ctx, oldUserName, newUserName); err != nil { + return err + } return nil } From 85634aab1a975dac035b22e479f1c26cb43d4a34 Mon Sep 17 00:00:00 2001 From: hiifong Date: Fri, 7 Jul 2023 00:51:39 +0800 Subject: [PATCH 2/9] fix lint --- services/user/user.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/services/user/user.go b/services/user/user.go index 682580ba5034..54a41226c06c 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -58,10 +58,7 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err u.Name = oldUserName return err } - if err := repo_model.UpdateRepositoryOwnerName(ctx, oldUserName, newUserName); err != nil { - return err - } - return nil + return repo_model.UpdateRepositoryOwnerName(ctx, oldUserName, newUserName) } ctx, committer, err := db.TxContext(ctx) From c60c6028360e3f53da25c12790fe97211e6f7b41 Mon Sep 17 00:00:00 2001 From: hiifong Date: Fri, 7 Jul 2023 17:45:39 +0800 Subject: [PATCH 3/9] replaced --- services/user/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/user/user.go b/services/user/user.go index 54a41226c06c..06a653dee1a5 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -58,7 +58,7 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err u.Name = oldUserName return err } - return repo_model.UpdateRepositoryOwnerName(ctx, oldUserName, newUserName) + return repo_model.UpdateRepositoryOwnerNames(u.ID, newUserName) } ctx, committer, err := db.TxContext(ctx) @@ -77,7 +77,7 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err } } - if err = repo_model.UpdateRepositoryOwnerName(ctx, oldUserName, newUserName); err != nil { + if err = repo_model.UpdateRepositoryOwnerNames(u.ID, newUserName); err != nil { return err } From 6fed2c4e6df9716bcd234fd3a32ef87a3ccee9fd Mon Sep 17 00:00:00 2001 From: hiifong Date: Fri, 7 Jul 2023 18:00:11 +0800 Subject: [PATCH 4/9] fix --- routers/web/org/setting.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 553993667b41..4e9cba355a8d 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -129,7 +129,9 @@ func SettingsPost(ctx *context.Context) { return } } - } else if nameChanged { + } + + if nameChanged { if err := repo_model.UpdateRepositoryOwnerNames(org.ID, org.Name); err != nil { ctx.ServerError("UpdateRepository", err) return From 011566142215c346011e4d771ca7fa395e1cefeb Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 11 Jul 2023 15:07:50 +0800 Subject: [PATCH 5/9] Update routers/web/org/setting.go Co-authored-by: yp05327 <576951401@qq.com> --- routers/web/org/setting.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 4e9cba355a8d..d84dcdaaa9d9 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -133,7 +133,7 @@ func SettingsPost(ctx *context.Context) { if nameChanged { if err := repo_model.UpdateRepositoryOwnerNames(org.ID, org.Name); err != nil { - ctx.ServerError("UpdateRepository", err) + ctx.ServerError("UpdateRepositoryOwnerNames", err) return } } From 6b94a7a8a1d96cbd2fdb16c7bc5aeaec385b29a9 Mon Sep 17 00:00:00 2001 From: hiifong Date: Tue, 11 Jul 2023 16:05:53 +0800 Subject: [PATCH 6/9] fix --- routers/web/org/setting.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index d84dcdaaa9d9..bd558f78b89a 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -131,13 +131,6 @@ func SettingsPost(ctx *context.Context) { } } - if nameChanged { - if err := repo_model.UpdateRepositoryOwnerNames(org.ID, org.Name); err != nil { - ctx.ServerError("UpdateRepositoryOwnerNames", err) - return - } - } - log.Trace("Organization setting updated: %s", org.Name) ctx.Flash.Success(ctx.Tr("org.settings.update_setting_success")) ctx.Redirect(ctx.Org.OrgLink + "/settings") From 5e482e50715813cdcb2fb59a09f22f0caa94cb1a Mon Sep 17 00:00:00 2001 From: hiifong Date: Wed, 12 Jul 2023 15:52:36 +0800 Subject: [PATCH 7/9] Update user.go --- services/user/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/user/user.go b/services/user/user.go index 06a653dee1a5..bb3dd002ea06 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -77,7 +77,7 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err } } - if err = repo_model.UpdateRepositoryOwnerNames(u.ID, newUserName); err != nil { + if err = repo_model.UpdateRepositoryOwnerName(ctx, oldUserName, newUserName); err != nil { return err } From a86bfec654082f72e6eea780bd6bc82b6a63cb7c Mon Sep 17 00:00:00 2001 From: hiifong Date: Wed, 12 Jul 2023 16:41:43 +0800 Subject: [PATCH 8/9] fix --- routers/web/org/setting.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index bd558f78b89a..4e9cba355a8d 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -131,6 +131,13 @@ func SettingsPost(ctx *context.Context) { } } + if nameChanged { + if err := repo_model.UpdateRepositoryOwnerNames(org.ID, org.Name); err != nil { + ctx.ServerError("UpdateRepository", err) + return + } + } + log.Trace("Organization setting updated: %s", org.Name) ctx.Flash.Success(ctx.Tr("org.settings.update_setting_success")) ctx.Redirect(ctx.Org.OrgLink + "/settings") From 47fd00256293a5865782e8865a89431d907a7980 Mon Sep 17 00:00:00 2001 From: hiifong Date: Thu, 13 Jul 2023 16:45:31 +0800 Subject: [PATCH 9/9] remove second --- routers/web/org/setting.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 4e9cba355a8d..bd558f78b89a 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -131,13 +131,6 @@ func SettingsPost(ctx *context.Context) { } } - if nameChanged { - if err := repo_model.UpdateRepositoryOwnerNames(org.ID, org.Name); err != nil { - ctx.ServerError("UpdateRepository", err) - return - } - } - log.Trace("Organization setting updated: %s", org.Name) ctx.Flash.Success(ctx.Tr("org.settings.update_setting_success")) ctx.Redirect(ctx.Org.OrgLink + "/settings")