Merge pull request #491 from sparc-request/ac-fix-duplicate-users-bug

fix adding duplicate users when creating new protocol

app/controllers/dashboard/protocols_controller.rb

@@ -96,16 +96,17 @@ def new
 
   def create
     protocol_class = params[:protocol][:type].capitalize.constantize
-    @protocol = protocol_class.create(params[:protocol])
-    @protocol.update_attributes(study_type_question_group_id: StudyTypeQuestionGroup.active_id)
+    @protocol = protocol_class.new(params[:protocol])
+    @protocol.study_type_question_group_id = StudyTypeQuestionGroup.active_id
 
     if @protocol.valid?
-      if @protocol.project_roles.where(identity_id: current_user.id).empty?
+      unless @protocol.project_roles.map(&:identity_id).include? current_user.id
         # if current user is not authorized, add them as an authorized user
         @protocol.project_roles.new(identity_id: current_user.id, role: 'general-access-user', project_rights: 'approve')
-        @protocol.save
       end
 
+      @protocol.save
+
       if USE_EPIC && @protocol.selected_for_epic
         @protocol.ensure_epic_user
         Notifier.notify_for_epic_user_approval(@protocol).deliver unless QUEUE_EPIC

app/controllers/protocols_controller.rb

@@ -56,11 +56,13 @@ def create
       @current_step = 'user_details'
       @protocol.populate_for_edit
     elsif @current_step == 'user_details' and @protocol.valid?
-      if @protocol.project_roles.where(identity_id: current_user.id).empty?
+      unless @protocol.project_roles.map(&:identity_id).include? current_user.id
         # if current user is not authorized, add them as an authorized user
         @protocol.project_roles.new(identity_id: current_user.id, role: 'general-access-user', project_rights: 'approve')
-        @protocol.save
       end
+
+      @protocol.save
+
       @current_step = 'return_to_service_request'
 
       if @service_request