Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix 500 when delete orgnization and resolved #486

Browse source
This commit is contained in:
Lunny Xiao 2016-12-27 10:02:14 +08:00 committed by Kim "BKC" Carlbäcker
parent 59f736d54c
commit ba134bd27a
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

@ -213,12 +213,9 @@ func Organizations(opts *SearchUserOptions) ([]*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
} }
@ -235,7 +232,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()
} }
// ________ ____ ___ // ________ ____ ___

2
models/user.go
View file

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