From a82526736b047beadd8dad46c6a1b78ad10099e6 Mon Sep 17 00:00:00 2001
From: Ahmad Farhat <ahmad.af.farhat@gmail.com>
Date: Fri, 20 Mar 2020 14:07:39 -0400
Subject: [PATCH] Fixed issue with adding roles (#1051)

---
 app/controllers/concerns/rolify.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/concerns/rolify.rb b/app/controllers/concerns/rolify.rb
index dbfc9fb0aa..0dfff42870 100644
--- a/app/controllers/concerns/rolify.rb
+++ b/app/controllers/concerns/rolify.rb
@@ -51,7 +51,7 @@ def update_roles(roles)
     return true unless current_user.highest_priority_role.get_permission("can_manage_users")
 
     new_roles = roles.split(' ').map(&:to_i)
-    old_roles = @user.roles.distinct.pluck(:id)
+    old_roles = @user.roles.pluck(:id).uniq
 
     added_role_ids = new_roles - old_roles
     removed_role_ids = old_roles - new_roles