[ARVADOS] updated: 45f25c3c3db844e2fa54d0d8761607ecc4304149

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/pipeline_templates/_show_recent.html.erb | 2 +-
 apps/workbench/app/views/pipeline_templates/show.html.erb         | 2 +-
 sdk/python/arvados/collection.py                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  45f25c3c3db844e2fa54d0d8761607ecc4304149 (commit)
       via  96d9f313205dcc038a50c25a3ffdacd6516f62bf (commit)
       via  c78412ea3d188e3e035b285d10f89cf592b21071 (commit)
      from  4bde33a6a4ad1390504e270ee2ea881a867b5d5b (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 45f25c3c3db844e2fa54d0d8761607ecc4304149
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 12 16:41:48 2014 -0400

    2875: initial description on pipeline instance when the template has no name.

diff --git a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
index b6007da..4c92643 100644
--- a/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
+++ b/apps/workbench/app/views/pipeline_templates/_show_recent.html.erb
@@ -35,7 +35,7 @@
                                      action_method: 'post',
                                      action_data: {selection_param: 'pipeline_instance[owner_uuid]',
                                                    'pipeline_instance[pipeline_template_uuid]' => ob.uuid,
-                                                   'pipeline_instance[description]' => "Created using the pipeline template *#{ob.name}* at #{Time.now.localtime}",
+                                                   'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (ob.name.andand.size>0 ? " using the pipeline template *#{ob.name}*" : ""),
                                                    'success' => 'redirect-to-created-object'
                                                   }.to_json),
                 { class: "btn btn-default btn-xs", title: "Run #{ob.name}", remote: true, method: 'get' }
diff --git a/apps/workbench/app/views/pipeline_templates/show.html.erb b/apps/workbench/app/views/pipeline_templates/show.html.erb
index 6e5a19e..9dc954f 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 using the pipeline template *#{@object.name}* at #{Time.now.localtime}",
+                                                   'pipeline_instance[description]' => "Created at #{Time.now.localtime}" + (@object.name.andand.size>0 ? " using the pipeline template *#{@object.name}*" : ""),
                                                    'success' => 'redirect-to-created-object'
                                                   }.to_json),
                 { class: "btn btn-primary btn-sm", remote: true, method: 'get' }

commit 96d9f313205dcc038a50c25a3ffdacd6516f62bf
Merge: 4bde33a c78412e
Author: radhika <radhika at curoverse.com>
Date:   Fri Sep 12 15:48:45 2014 -0400

    Merge branch 'master' into 2875-pipeline-description


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


hooks/post-receive
--