Merge pull request #2366 from sparc-request/jl-protocol-only-epic-queue

Jl - Protocol-only and multiple epic queue record bug
sparc-request · May 21, 2020 · aeaf2c7 · aeaf2c7
2 parents 7330d1e + 6a78c35
commit aeaf2c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/dashboard/protocols_controller.rb b/app/controllers/dashboard/protocols_controller.rb
@@ -163,7 +163,9 @@ def update
 
       if @protocol.update_attributes(protocol_params)
         if Setting.get_value("use_epic") && @protocol.selected_for_epic && (@protocol.last_epic_push_time != nil) && Setting.get_value("queue_epic")
-          EpicQueue.create(protocol_id: @protocol.id, identity_id: current_user.id)
+          if EpicQueue.where(protocol_id: @protocol.id).size == 0
+            EpicQueue.create(protocol_id: @protocol.id, identity_id: current_user.id, user_change: true)
+          end
         end
 
         flash[:success] = I18n.t('protocols.updated', protocol_type: @protocol.type)

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
@@ -71,7 +71,9 @@ def update
       end
 
       if Setting.get_value("use_epic") && @protocol.selected_for_epic && (@protocol.last_epic_push_time != nil) && Setting.get_value("queue_epic")
-        EpicQueue.create(protocol_id: @protocol.id, identity_id: current_user.id)
+        if EpicQueue.where(protocol_id: @protocol.id).size == 0
+          EpicQueue.create(protocol_id: @protocol.id, identity_id: current_user.id, user_change: true)
+        end
       end
 
       flash[:success] = I18n.t('protocols.updated', protocol_type: @protocol.type)