Merge branch 'master' into 6203-collection-perf-api

[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 f933c07701fdcf781c7c19559b6bb023bf7667be..3ece865959f10aabf70acfab6cde1dd9145cf6d5 100644 (file)
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -7,16 +7,8 @@ class Job < ArvadosBase
     "#{script} job"
   end
 
-  def attribute_editable? attr, *args
-    if attr.to_sym == :description
-      super && attr.to_sym == :description
-    else
-      false
-    end
-  end
-
-  def self.creatable?
-    false
+  def editable_attributes
+    %w(description)
   end
 
   def default_name
@@ -42,33 +34,10 @@ class Job < ArvadosBase
     arvados_api_client.api("jobs/", "queue_size", {"_method"=> "GET"})[:queue_size] rescue 0
   end
 
-  def self.queue 
+  def self.queue
     arvados_api_client.unpack_api_response arvados_api_client.api("jobs/", "queue", {"_method"=> "GET"})
   end
 
-  # The 'job' parameter can be either a Job model object, or a hash containing
-  # the same fields as a Job object (such as the :job entry of a pipeline
-  # component).
-  def self.state job
-    # This has a valid state method on it so call that
-    if job.respond_to? :state and job.state
-      return job.state
-    end
-
-    # Figure out the state based on the other fields.
-    if job[:cancelled_at]
-      "Cancelled"
-    elsif job[:success] == false
-      "Failed"
-    elsif job[:success] == true
-      "Complete"
-    elsif job[:running] == true
-      "Running"
-    else
-      "Queued"
-    end
-  end
-
   def textile_attributes
     [ 'description' ]
   end