summaryrefslogtreecommitdiffstats
path: root/models/org.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/org.go')
-rw-r--r--models/org.go13
1 files changed, 7 insertions, 6 deletions
diff --git a/models/org.go b/models/org.go
index b302288ca5..43a3e094f1 100644
--- a/models/org.go
+++ b/models/org.go
@@ -213,12 +213,9 @@ func Organizations(opts *SearchUserOptions) ([]*User, error) {
// DeleteOrganization completely and permanently deletes everything of organization.
func DeleteOrganization(org *User) (err error) {
- if err := DeleteUser(org); err != nil {
- return err
- }
-
sess := x.NewSession()
- defer sessionRelease(sess)
+ defer sess.Close()
+
if err = sess.Begin(); err != nil {
return err
}
@@ -235,7 +232,11 @@ func DeleteOrganization(org *User) (err error) {
return fmt.Errorf("deleteUser: %v", err)
}
- return sess.Commit()
+ if err = sess.Commit(); err != nil {
+ return err
+ }
+
+ return RewriteAllPublicKeys()
}
// ________ ____ ___