[ARVADOS] updated: a3615da860d1d78d0ecb7e2890eea26963b5c01e

git at public.curoverse.com git at public.curoverse.com
Tue Sep 9 15:23:08 EDT 2014


Summary of changes:
 .../app/views/collections/_show_files.html.erb     |   4 +
 .../collections/_show_source_summary.html.erb      |   5 +-
 apps/workbench/config/application.default.yml      |   3 +
 crunch_scripts/arvados-bcbio-nextgen.py            |   2 +
 sdk/cli/bin/crunch-job                             |  24 +-
 sdk/python/arvados/collection.py                   |   2 +-
 sdk/python/arvados/commands/keepdocker.py          | 149 +++++-
 sdk/python/arvados/commands/put.py                 | 143 +++---
 sdk/python/arvados/stream.py                       |   7 +-
 sdk/python/arvados/util.py                         |  18 +
 sdk/python/tests/test_arv_put.py                   |  99 +---
 sdk/python/tests/test_collections.py               |  10 +-
 services/api/app/models/job.rb                     |   8 +
 .../migrate/20140828141043_job_priority_fixup.rb   |  11 +
 services/api/db/structure.sql                      |   6 +-
 services/api/test/fixtures/jobs.yml                |  12 +-
 .../functional/arvados/v1/jobs_controller_test.rb  |   1 +
 services/fuse/arvados_fuse/__init__.py             | 550 +++++++++++++++------
 services/fuse/bin/arv-mount                        |  70 ++-
 services/fuse/tests/test_mount.py                  | 272 +++++-----
 20 files changed, 882 insertions(+), 514 deletions(-)
 create mode 100644 services/api/db/migrate/20140828141043_job_priority_fixup.rb

       via  a3615da860d1d78d0ecb7e2890eea26963b5c01e (commit)
       via  960925be39948cda7f6ff0775887ba411a4e82ea (commit)
       via  b0440160e64caecbff160a26f62301dd15d84c7f (commit)
       via  300729d2ef4d0e7b9d86444c4a784b7e0b3beb6d (commit)
       via  f467b469109e27bc18635c8952892e4c23fabd60 (commit)
       via  83bcea2d5b07cfba63d3252a98d4ad75528e18f4 (commit)
       via  d97be42e8dd9a9495480b8c1e2a83db46b79cb5c (commit)
       via  7f3ed5e22e01b9cc8efe9ebfc79a2591b37b14d7 (commit)
       via  50e48820312868513b6efcafa84c6d825ac51cd4 (commit)
       via  8eeb2671b0a9815345218da335731a31230ada13 (commit)
       via  34110141b39878d60b9223b55932f7d36e59f405 (commit)
       via  d6ee8d4ef006903465dff945685c608cf91860ce (commit)
       via  837cb95f2897411533cf35a62f50d62ca9ee3e3b (commit)
       via  bd86112ffba029e0f2c29c7d12ae6192e4097e18 (commit)
       via  be4c2feb3d9ba3c2631d78e68bc5ed2945c17cab (commit)
       via  90fc79852a995fd8e665cf48ae20c49a9bbc78eb (commit)
       via  b6017f4edc19188fa26f74ff0da2bedb94841dcf (commit)
       via  9e9506f9acce0d11a82f7abcea31680761d6427b (commit)
       via  c6537733d0bd44f0319dec074492e7e943549145 (commit)
       via  52e25652032ccf70f6cade4e575102840b212aa1 (commit)
       via  3d1181ac8527cdd355b14872b808cbaede26e487 (commit)
       via  c8de202a8ba2b7e128f9698c4b57f0d7d9e89c1d (commit)
       via  fb24229eaf2d3af64fe406de850ab25b9c0611e1 (commit)
       via  d07045494292cbaaac3f526ce816656740d2510f (commit)
       via  9479599527ffdf5e4de14e8ccc79eeb3c6776526 (commit)
       via  6a0610e67965f2ba9ff9df2df36d92d3fa2450a2 (commit)
       via  1079c06e15ab4a14c22b9120e80d54ebf4aa01e5 (commit)
       via  0576030b3181b72f8395c73e0f3562582b59c2aa (commit)
       via  6b4405e36bb59ebd4714690eeb8518c4a2fa019b (commit)
       via  0abff82784887a0d8d8f6f4b67972296a2aa7728 (commit)
       via  b366f855557333cd99fce42ab56af1c66388b18e (commit)
       via  252d0e3c02b355577e4d20331c787cbb7b02a7d8 (commit)
       via  918f5ae5518079a35b5008c3df8429e0c4fab1d6 (commit)
       via  cd41c68c201f5307ec3372fa141842e1be695a98 (commit)
       via  a9e8119ed4931df57eef92121bc1dd6e65fa8783 (commit)
       via  370d158d6cfd9a610e68946cc22998543ef10e3d (commit)
       via  04bce28b705a6ca33d2c9b19aa783f588a99c8e0 (commit)
       via  d770a5119378b5c133b19d7c44881c3db313e448 (commit)
       via  a92397d6b80e25974da5d56ef59ab27eb9b45384 (commit)
       via  72de9238eda9b294c281d1ee747b00f3eca5c1df (commit)
       via  ef6ab39ebdf8519ea6a2bfd2d658469eb3917f47 (commit)
       via  701c816ee3d87b7064cdced3a3c11befd3867a3f (commit)
       via  cd9c840e17c74989e6e60b5dd73d904d0165443f (commit)
       via  80cbf4d912084fd80930cef112189024071eb4eb (commit)
       via  38dc6b9ddabb0e0e76128bfc4ff372f597d8e25e (commit)
       via  bf1f3980c2ec62969b663c1665cb0818e118dfba (commit)
      from  7e3496abb1b8c70607df37b6f096c8acd42d714d (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 a3615da860d1d78d0ecb7e2890eea26963b5c01e
Merge: 960925b b044016
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 9 15:17:43 2014 -0400

    Merge branch 'master' into 3654-combine-selections


commit 960925be39948cda7f6ff0775887ba411a4e82ea
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 9 15:16:23 2014 -0400

    3654: display show icon for files only when the file suffix is one of txt, gif etc. Also, fixed a bug in summary html where the collection show was failing when finished_at is not available.

diff --git a/apps/workbench/app/views/collections/_show_files.html.erb b/apps/workbench/app/views/collections/_show_files.html.erb
index c830e85..4718cb1 100644
--- a/apps/workbench/app/views/collections/_show_files.html.erb
+++ b/apps/workbench/app/views/collections/_show_files.html.erb
@@ -51,9 +51,13 @@
                 :title => "Include #{file_path} in your selections",
               } %>
           <% end %>
+
+          <% if Rails.configuration.filename_suffixes_with_view_icon.include? file_path.split('.')[-1] %>
           <%= link_to(raw('<i class="fa fa-search"></i>'),
                       link_params.merge(disposition: 'inline'),
                       {title: "View #{file_path}", class: "btn btn-info btn-sm"}) %>
+          <% end %>
+
           <%= link_to(raw('<i class="fa fa-download"></i>'),
                       link_params.merge(disposition: 'attachment'),
                       {title: "Download #{file_path}", class: "btn btn-info btn-sm"}) %>
diff --git a/apps/workbench/app/views/collections/_show_source_summary.html.erb b/apps/workbench/app/views/collections/_show_source_summary.html.erb
index c1336b7..ba9e9df 100644
--- a/apps/workbench/app/views/collections/_show_source_summary.html.erb
+++ b/apps/workbench/app/views/collections/_show_source_summary.html.erb
@@ -7,7 +7,10 @@
     <% pipelines = PipelineInstance.filter([["components", "like", "%#{@object.uuid}%"]]).each do |pipeline| %>
       <% pipeline.components.each do |cname, c| %>
         <% if c[:output_uuid] == @object.uuid %>
-          <b><%= cname %></b> component of pipeline <b><%= link_to_if_arvados_object(pipeline, friendly_name: true) %></b> finished at <%= c[:job][:finished_at] %>
+          <b><%= cname %></b> component of pipeline <b><%= link_to_if_arvados_object(pipeline, friendly_name: true) %></b>
+          <% if c.andand[:job].andand[:finished_at] %>
+            <b>finished at <%= c[:job][:finished_at] %></b>
+          <% end %>
         <% end %>
       <% end %>
     <% end %>
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 1be5454..893b28c 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -141,3 +141,6 @@ common:
   issue_reporter_email_from: arvados at example.com
   issue_reporter_email_to: arvados at example.com
   support_email_address: arvados at example.com
+
+  # filename suffixes for which view icon would be shown in collection show page
+  filename_suffixes_with_view_icon: [txt, gif, jpeg, jpg, png, html, htm, pdf]

commit 300729d2ef4d0e7b9d86444c4a784b7e0b3beb6d
Merge: 7e3496a f467b46
Author: radhika <radhika at curoverse.com>
Date:   Tue Sep 9 13:25:12 2014 -0400

    Merge branch 'master' into 3654-combine-selections


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list