Browse Source

fix 500 when delete orgnization and resolved #486

tags/v1.1.0
Lunny Xiao 7 years ago
parent
commit
ba134bd27a
2 changed files with 11 additions and 8 deletions
  1. 7
    6
      models/org.go
  2. 4
    2
      models/user.go

+ 7
- 6
models/org.go View File



// 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
} }
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()
} }


// ________ ____ ___ // ________ ____ ___

+ 4
- 2
models/user.go View File

} }


avatarPath := u.CustomAvatarPath() avatarPath := u.CustomAvatarPath()
if err := os.Remove(avatarPath); err != nil {
return fmt.Errorf("Fail to remove %s: %v", avatarPath, err)
if com.IsExist(avatarPath) {
if err := os.Remove(avatarPath); err != nil {
return fmt.Errorf("Fail to remove %s: %v", avatarPath, err)
}
} }


return nil return nil

Loading…
Cancel
Save