Merge pull request #1158 from sparc-request/wth-epic-origin-bug

wth - (SPARCRequest) Epic Push Origin Bug
sparc-request · Oct 17, 2017 · 243a054 · 243a054
2 parents 2daebb7 + c3df7f5
commit 243a054
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/dashboard/epic_queues_controller.rb b/app/controllers/dashboard/epic_queues_controller.rb
@@ -28,6 +28,7 @@ def index
       format.json do
         if params[:user_change]
           @epic_queues = EpicQueue.where(
+            attempted_push: false,
             user_change: true
           )
         else

diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb
@@ -294,7 +294,7 @@ def push_protocol_to_epic protocol
     # Thread.new do
     begin
       # Do the actual push.  This might take a while...
-      protocol.push_to_epic(EPIC_INTERFACE, "pi_email_approval", current_user.id)
+      protocol.push_to_epic(EPIC_INTERFACE, "submission_push", current_user.id)
       errors = EPIC_INTERFACE.errors
       session[:errors] = errors unless errors.empty?
       @epic_errors = true unless errors.empty?

diff --git a/lib/tasks/send_to_epic.rake b/lib/tasks/send_to_epic.rake
@@ -4,7 +4,10 @@ task send_to_epic: :environment do
 
   epic_queues.each do |eq|
     p = Protocol.find(eq.protocol_id)
-    p.push_to_epic(EPIC_INTERFACE, nil, nil, true)
+    p.push_to_epic(EPIC_INTERFACE, 'admin_push', eq.identity_id, true)
+    if p.last_epic_push_status == 'complete'
+      eq.update_attribute(:attempted_push, true)
+    end
   end
 end