Merge branch 'master' into 3889-functional-testing

[arvados.git] / apps / workbench / app / models / job.rb

diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index a0247ef10448284ce1b6bea0573f1ac77c8fd994..977eef91bf278ac5e9a528e935262dce478e4fa5 100644 (file)
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -42,24 +42,8 @@ class Job < ArvadosBase
     arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
   end
 
-  def self.state job
-    if job.respond_to? :state and job.state
-      return job.state
-    end
-
-    if not job[:cancelled_at].nil?
-      "Cancelled"
-    elsif not job[:finished_at].nil? or not job[:success].nil?
-      if job[:success]
-        "Completed"
-      else
-        "Failed"
-      end
-    elsif job[:running]
-      "Running"
-    else
-      "Queued"
-    end
+  def self.queue 
+    arvados_api_client.unpack_api_response arvados_api_client.api("jobs/", "queue", {"_method"=> "GET"})
   end
 
   def textile_attributes