Merge branch 'master' into 3219-further-docker-improvements

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

diff --git a/apps/workbench/app/models/pipeline_instance.rb b/apps/workbench/app/models/pipeline_instance.rb
index beeba625856b1a73ddcd4d595a368f4518fbba9f..c3b14755f3fb6f8dbdf77d3630e689797cca8eea 100644 (file)
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -1,7 +1,7 @@
 class PipelineInstance < ArvadosBase
   attr_accessor :pipeline_template
 
-  def self.goes_in_folders?
+  def self.goes_in_projects?
     true
   end
 
@@ -29,9 +29,10 @@ class PipelineInstance < ArvadosBase
     end
   end
   
-  def attribute_editable?(attr)
-    attr && (attr.to_sym == :name ||
-            (attr.to_sym == :components and (self.state == 'New' || self.state == 'Ready')))
+  def attribute_editable? attr, *args
+    super && (attr.to_sym == :name ||
+              (attr.to_sym == :components and
+               (self.state == 'New' || self.state == 'Ready')))
   end
 
   def attributes_for_display