core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

500 when wiki not exists

This commit is contained in:
Unknwon 2015-12-03 02:08:25 -05:00
parent f122d0856e
commit 37a372f6f5
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
models/repo.go
View File

@ -985,8 +985,13 @@ func TransferOwnership(u *User, newOwnerName string, repo *Repository) error {
// Change repository directory name. // Change repository directory name.
if err = os.Rename(RepoPath(owner.Name, repo.Name), RepoPath(newOwner.Name, repo.Name)); err != nil { if err = os.Rename(RepoPath(owner.Name, repo.Name), RepoPath(newOwner.Name, repo.Name)); err != nil {
return fmt.Errorf("rename repository directory: %v", err) return fmt.Errorf("rename repository directory: %v", err)
} else if err = os.Rename(WikiPath(owner.Name, repo.Name), WikiPath(newOwner.Name, repo.Name)); err != nil { }
return fmt.Errorf("rename repository wiki: %v", err)
wikiPath := WikiPath(owner.Name, repo.Name)
if com.IsExist(wikiPath) {
if err = os.Rename(wikiPath, WikiPath(newOwner.Name, repo.Name)); err != nil {
return fmt.Errorf("rename repository wiki: %v", err)
}
} }
return sess.Commit() return sess.Commit()
@ -1014,9 +1019,12 @@ func ChangeRepositoryName(u *User, oldRepoName, newRepoName string) (err error)
wikiPath := WikiPath(u.Name, oldRepoName) wikiPath := WikiPath(u.Name, oldRepoName)
if com.IsExist(wikiPath) { if com.IsExist(wikiPath) {
err = os.Rename(WikiPath(u.Name, oldRepoName), WikiPath(u.Name, newRepoName)) if err = os.Rename(wikiPath, WikiPath(u.Name, newRepoName)); err != nil {
return fmt.Errorf("rename repository wiki: %v", err)
}
} }
return err
return nil
} }
func getRepositoriesByForkID(e Engine, forkID int64) ([]*Repository, error) { func getRepositoriesByForkID(e Engine, forkID int64) ([]*Repository, error) {