Merge branch 'master' into 3338-tab-counts

[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 d0b4dcdb6be0cc2bb6ffa026be0b67cab02a5dad..89acbb0dbb9438bbbb80ba2bc97cc1ce93eac9fa 100644 (file)
--- a/apps/workbench/app/models/pipeline_instance.rb
+++ b/apps/workbench/app/models/pipeline_instance.rb
@@ -9,7 +9,11 @@ class PipelineInstance < ArvadosBase
     pipeline_name = self.name
     if pipeline_name.nil? or pipeline_name.empty?
       template = PipelineTemplate.where(uuid: self.pipeline_template_uuid).first
-      template.name if template else self.uuid
+      if template
+        template.name
+      else
+        self.uuid
+      end
     else
       pipeline_name
     end
@@ -40,7 +44,7 @@ class PipelineInstance < ArvadosBase
   end
 
   def attribute_editable? attr, *args
-    super && (attr.to_sym == :name ||
+    super && (attr.to_sym == :name || attr.to_sym == :description ||
               (attr.to_sym == :components and
                (self.state == 'New' || self.state == 'Ready')))
   end
@@ -63,4 +67,8 @@ class PipelineInstance < ArvadosBase
       "\"#{input_name.to_s}\" parameter for #{component[:script]} script in #{component_name} component"
     end
   end
+
+  def textile_attributes
+    [ 'description' ]
+  end
 end