Skip to content

Commit de8127e

Browse files
GiteaBothiifong
andauthored
fix incorrect repo url when changed the case of ownername (go-gitea#25733) (go-gitea#25881)
Backport go-gitea#25733 by @hiifong When only the casing of the username changes, update the owner name of the repo, and keep the original logic consistent with other conditions. example: assume your username is `gitea`, lowercase username is `gitea` too, repo URL is `.../gitea/{repo}`. You change your username to `Gitea`, `GiTea` or something like that, as long as the lowercase username is still `gitea`, the repo URL remained `.../gitea/{repo}`. this pr keeps the new username consistent with the repo URL. 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) Co-authored-by: hiifong <i@hiif.ong>
1 parent f7e271f commit de8127e

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

routers/web/org/setting.go

-6
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ func SettingsPost(ctx *context.Context) {
8989
// reset ctx.org.OrgLink with new name
9090
ctx.Org.OrgLink = setting.AppSubURL + "/org/" + url.PathEscape(form.Name)
9191
log.Trace("Organization name changed: %s -> %s", org.Name, form.Name)
92-
nameChanged = false
9392
}
9493

9594
// In case it's just a case change.
@@ -130,11 +129,6 @@ func SettingsPost(ctx *context.Context) {
130129
return
131130
}
132131
}
133-
} else if nameChanged {
134-
if err := repo_model.UpdateRepositoryOwnerNames(org.ID, org.Name); err != nil {
135-
ctx.ServerError("UpdateRepository", err)
136-
return
137-
}
138132
}
139133

140134
log.Trace("Organization setting updated: %s", org.Name)

services/user/user.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func RenameUser(ctx context.Context, u *user_model.User, newUserName string) err
5858
u.Name = oldUserName
5959
return err
6060
}
61-
return nil
61+
return repo_model.UpdateRepositoryOwnerNames(u.ID, newUserName)
6262
}
6363

6464
ctx, committer, err := db.TxContext(ctx)

0 commit comments

Comments
 (0)