From 4628aa5251ad1a9785f449fb43c7dfe3f01178cf Mon Sep 17 00:00:00 2001
From: hiifong <i@hiif.ong>
Date: Fri, 14 Jul 2023 13:42:10 +0800
Subject: [PATCH] fix incorrect repo url when changed the case of ownername
 (#25733)

When only the case of the username changes and the new username is
consistent with the lowercase username of the old user name, update the
owner name of the repo, and keep the original logic consistent with
other conditions.

example: your username is `gitea`, lowercase username is `gitea`,repo
url is `.../gitea/{repo}`, you changed username to `Gitea` or `GiTea` or
other, but the lowercase username is still `gitea`, the repo url is
still `.../gitea/{repo}`.

this pr fixed it,keep username and repo url consistent.

Before:

![image](https://github.com/go-gitea/gitea/assets/89133723/84177296-f0ff-4176-84f1-1f9ec3f5b86f)

![image](https://github.com/go-gitea/gitea/assets/89133723/8f8f4a12-ecdd-4dec-af89-85c009b0ccfe)


After:

![image](https://github.com/go-gitea/gitea/assets/89133723/0564edb6-9467-405a-8cd4-d6f70e6f614b)

![image](https://github.com/go-gitea/gitea/assets/89133723/554ecd6e-e5a1-43bc-a46d-99e988c2ff58)
---
 routers/web/org/setting.go | 6 ------
 services/user/user.go      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go
index b5653160a2..bd558f78b8 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.
@@ -130,11 +129,6 @@ func SettingsPost(ctx *context.Context) {
 				return
 			}
 		}
-	} else 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)
diff --git a/services/user/user.go b/services/user/user.go
index e0815bd860..bb3dd002ea 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 nil
+		return repo_model.UpdateRepositoryOwnerNames(u.ID, newUserName)
 	}
 
 	ctx, committer, err := db.TxContext(ctx)