mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-25 21:44:20 -04:00
fix 500 when delete orgnization and resolved #486
This commit is contained in:
parent
59f736d54c
commit
ba134bd27a
@ -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()
|
||||||
}
|
}
|
||||||
|
|
||||||
// ________ ____ ___
|
// ________ ____ ___
|
||||||
|
@ -891,8 +891,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
|
||||||
|
Loading…
Reference in New Issue
Block a user