From 859b9ad7ea8c4d7a5b2b448def361702213c5677 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 13 Dec 2017 06:26:31 +0800
Subject: [PATCH] fix org owner cannot be removed if there is not in owner team
(#3164)
---
models/org.go | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/models/org.go b/models/org.go
index 4a4fcb4add..b349e4c170 100644
--- a/models/org.go
+++ b/models/org.go
@@ -453,7 +453,12 @@ func RemoveOrgUser(orgID, userID int64) error {
return err
}
if t.NumMembers == 1 {
- return ErrLastOrgOwner{UID: userID}
+ if err := t.GetMembers(); err != nil {
+ return err
+ }
+ if t.Members[0].ID == userID {
+ return ErrLastOrgOwner{UID: userID}
+ }
}
}