Let members be invited from Add members pane.

1 files changed, 19 insertions, 3 deletions

diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index a63d5af1219..3b3b1bd4680 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -60,12 +60,28 @@ class ProjectMember < Member
                        raise "Non valid access"
                      end
 
+      users = user_ids.map do |user_id|
+        (user_id if user_id.is_a?(User)) ||
+          User.find_by(id: user_id) || 
+          User.find_by(email: user_id) || 
+          user_id
+      end
+
       ProjectMember.transaction do
         project_ids.each do |project_id|
-          user_ids.each do |user_id|
-            member = ProjectMember.new(access_level: access_level, user_id: user_id)
-            member.source_id = project_id
+          project = Project.find(project_id)
+
+          users.each do |user|
+            if user.is_a?(User)
+              member = project.project_members.find_or_initialize_by(user_id: user.id)
+            else
+              member = project.project_members.build
+              member.invite_email = user
+            end
+
             member.created_by ||= current_user
+            member.access_level = access_level
+
             member.save
           end
         end