[ARVADOS] updated: 2df94bb061c94971288736299fa09357236bd13b

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/pipeline_templates/show.html.erb | 2 +-
 sdk/cli/bin/arv-run-pipeline-instance                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  2df94bb061c94971288736299fa09357236bd13b (commit)
      from  66cba099dbc0c588fe676c029f5981ed6143c973 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2df94bb061c94971288736299fa09357236bd13b
Author: radhika <radhika at curoverse.com>
Date:   Wed Sep 17 14:10:40 2014 -0400

    no issue # - fix couple more places where description is failing on nil template name.

diff --git a/apps/workbench/app/views/pipeline_templates/show.html.erb b/apps/workbench/app/views/pipeline_templates/show.html.erb
index 9dc954f..723bce6 100644
--- a/apps/workbench/app/views/pipeline_templates/show.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/show.html.erb
@@ -7,7 +7,7 @@
                                      action_method: 'post',
                                      action_data: {selection_param: 'pipeline_instance[owner_uuid]',
                                                    'pipeline_instance[pipeline_template_uuid]' => @object.uuid,
-                                                   'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (@object.name.andand.size>0 ? " using the pipeline template *#{@object.name}*" : ""),
+                                                   'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (@object.name.andand.size.andand>0 ? " using the pipeline template *#{@object.name}*" : ""),
                                                    'success' => 'redirect-to-created-object'
                                                   }.to_json),
                 { class: "btn btn-primary btn-sm", remote: true, method: 'get' }
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index c6fd61f..05fce2c 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -485,7 +485,7 @@ class WhRunPipelineInstance
       end
     else
       description = $options[:description]
-      description = ("Created at #{Time.now.localtime}" + (@template[:name].andand.size>0 ? " using the pipeline template *#{@template[:name]}*" : "")) if !description
+      description = ("Created at #{Time.now.localtime}" + (@template[:name].andand.size.andand>0 ? " using the pipeline template *#{@template[:name]}*" : "")) if !description
       @instance = PipelineInstance.
         create(components: @components,
                properties: {

-----------------------------------------------------------------------


hooks/post-receive
--