From 9585dc782599192511de2f04828b163d52f1c8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Thu, 11 Oct 2018 07:58:22 +0200
Subject: [PATCH] added the UserWasRemoved flag to make api aware of what
 happened to return correct message to UI

---
 pkg/api/org_users.go               | 4 ++++
 pkg/models/org_user.go             | 1 +
 pkg/services/sqlstore/org_users.go | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/pkg/api/org_users.go b/pkg/api/org_users.go
index 83b6d56b2c6..6b3159d799b 100644
--- a/pkg/api/org_users.go
+++ b/pkg/api/org_users.go
@@ -125,5 +125,9 @@ func removeOrgUserHelper(cmd *m.RemoveOrgUserCommand) Response {
 		return Error(500, "Failed to remove user from organization", err)
 	}
 
+	if cmd.UserWasRemoved {
+		return Success("User deleted")
+	}
+
 	return Success("User removed from organization")
 }
diff --git a/pkg/models/org_user.go b/pkg/models/org_user.go
index 51ab2f62e68..e7896b3cab8 100644
--- a/pkg/models/org_user.go
+++ b/pkg/models/org_user.go
@@ -75,6 +75,7 @@ type RemoveOrgUserCommand struct {
 	UserId                   int64
 	OrgId                    int64
 	ShouldDeleteOrphanedUser bool
+	UserWasRemoved           bool
 }
 
 type AddOrgUserCommand struct {
diff --git a/pkg/services/sqlstore/org_users.go b/pkg/services/sqlstore/org_users.go
index a4d7cb52136..925893325c1 100644
--- a/pkg/services/sqlstore/org_users.go
+++ b/pkg/services/sqlstore/org_users.go
@@ -194,6 +194,8 @@ func RemoveOrgUser(cmd *m.RemoveOrgUserCommand) error {
 			if err := deleteUserInTransaction(sess, &m.DeleteUserCommand{UserId: user.Id}); err != nil {
 				return err
 			}
+
+			cmd.UserWasRemoved = true
 		}
 
 		return nil