peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix 500 when delete orgnization and resolved #486 (#507)

Browse Source
This commit is contained in:
Lunny Xiao 2016-12-28 08:53:17 +08:00 committed by GitHub
parent e8bac94d1f
commit fbb424c61d
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
models/org.go
View File

@ -206,12 +206,9 @@ func Organizations(page, pageSize int) ([]*User, error) {
// DeleteOrganization completely and permanently deletes everything of organization. // DeleteOrganization completely and permanently deletes everything of organization.
func DeleteOrganization(org *User) (err error) { func DeleteOrganization(org *User) (err error) {
if err := DeleteUser(org); err != nil {
return err
}
sess := x.NewSession() sess := x.NewSession()
defer sessionRelease(sess) defer sess.Close()
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
return err return err
} }
@ -228,7 +225,11 @@ func DeleteOrganization(org *User) (err error) {
return fmt.Errorf("deleteUser: %v", err) return fmt.Errorf("deleteUser: %v", err)
} }
return sess.Commit() if err = sess.Commit(); err != nil {
return err
}
return RewriteAllPublicKeys()
} }
// ________ ____ ___ // ________ ____ ___

6
models/user.go
View File

@ -885,8 +885,10 @@ func deleteUser(e *xorm.Session, u *User) error {
} }
avatarPath := u.CustomAvatarPath() avatarPath := u.CustomAvatarPath()
if err := os.Remove(avatarPath); err != nil { if com.IsExist(avatarPath) {
return fmt.Errorf("Fail to remove %s: %v", avatarPath, err) if err := os.Remove(avatarPath); err != nil {
return fmt.Errorf("Fail to remove %s: %v", avatarPath, err)
}
} }
return nil return nil