[ARVADOS] updated: 8cf32f391259389508b2b83c27d7b6bd1e70c2b6

[Git user]

Summary of changes:
 .../app/controllers/workflows_controller.rb        |  4 +
 .../application/_show_text_with_locators.html.erb  | 29 +++++--
 .../app/views/workflows/_show_definition.html.erb  | 48 ++++++++++++
 apps/workbench/app/views/workflows/show.html.erb   | 20 +++++
 apps/workbench/fpm-info.sh                         |  9 ++-
 .../container_requests_controller_test.rb          |  4 +-
 .../test/controllers/workflows_controller_test.rb  | 12 +++
 apps/workbench/test/integration/work_units_test.rb | 17 ++++
 .../ubuntu1604/Dockerfile                          |  2 +-
 build/run-build-packages-one-target.sh             |  8 ++
 build/run-library.sh                               |  8 +-
 sdk/cwl/arvados_cwl/__init__.py                    | 11 ++-
 sdk/cwl/arvados_cwl/arvjob.py                      |  1 +
 sdk/cwl/arvados_cwl/crunch_script.py               |  3 +-
 sdk/cwl/setup.py                                   |  4 +-
 sdk/cwl/tests/test_job.py                          |  2 +-
 services/api/fpm-info.sh                           |  2 +-
 .../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 12 ++-
 .../crunch-dispatch-slurm_test.go                  | 91 +++++++++++++++++-----
 19 files changed, 245 insertions(+), 42 deletions(-)
 create mode 100644 apps/workbench/app/views/workflows/_show_definition.html.erb
 create mode 100644 apps/workbench/app/views/workflows/show.html.erb

       via  8cf32f391259389508b2b83c27d7b6bd1e70c2b6 (commit)
       via  7f1e7f793bd1b5efa73df51b3070c5acb8fcdc82 (commit)
       via  bc65e5b981806594fde9f4c40bf5aa7d8e48b040 (commit)
       via  7bb1d40eed9436c2f7fbd5b11106f6fd8f020441 (commit)
       via  a309f8c5b4842075d6c83f99a8f2a1e1016976f5 (commit)
       via  3fa8a8a4142aac0fc6d3900b3f77de347b76268b (commit)
       via  97d759d73e24017c9cab74325d866960389c11a5 (commit)
       via  17432c8e77238e546913f8314b55748d00338a0b (commit)
       via  a795e5e02791cb7920aaded26bfa83a7ace1f386 (commit)
       via  94054d9fdb3ce00cafda6300e32e456c29fc0041 (commit)
       via  02b75a37c98f3357ba079d01166576153032a238 (commit)
       via  411109e1c30d61bce39f29851838540e0a5787e5 (commit)
       via  8b6d154d2a1e89bbabb8f7730d37bffb54d4de6d (commit)
       via  303d374c370f334426570864258df6364b9f3f0b (commit)
       via  6ad31a32b13094ce162a2175956232403b13693f (commit)
       via  209c2259a8bf0218e585da037a04e2d9d79400ee (commit)
       via  a5c53dceed8480e667249fc5fee3349bbaf20ec8 (commit)
       via  62a0bbe9c1f6e3376b25d0f415302eb7dcdf55f3 (commit)
       via  a7bd5fa6c4353745260398eaa61c5b857975d222 (commit)
       via  4644e14f4158e3fa288abf6d979d2526606e5615 (commit)
       via  f8675ad473b45387b1286c6b7a41edf36148ebac (commit)
       via  4c1d34eee72603b850bea8d5dc95c225e644954f (commit)
       via  79aeb557d94681fb7e55321aeee2e20df1430b30 (commit)
       via  74d98b5f5cfee651eebfd8c63842a08241dcd736 (commit)
       via  5cd02331394595a6e64f19c2cc14c9955c9266dd (commit)
       via  d66c9f93da79b8bfdffdb1684f19ac388c31ce97 (commit)
       via  1586823b65c7ec7656626e491a31f3f9516a4a56 (commit)
       via  ac3bafbcbc8e6d6c6b3be13e3e29b7ab7cf4ad7a (commit)
      from  776885d3a1e4a188fb7ed5191b377a49aa5909a9 (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 8cf32f391259389508b2b83c27d7b6bd1e70c2b6
Merge: 17432c8 7f1e7f7
Author: radhika <radhika at curoverse.com>
Date:   Thu May 11 12:55:26 2017 -0400

    Merge branch 'master' into 10645-cr-display-perf


commit 17432c8e77238e546913f8314b55748d00338a0b
Author: radhika <radhika at curoverse.com>
Date:   Thu May 11 08:44:24 2017 -0400

    10645: link_to locator with disposition

diff --git a/apps/workbench/app/views/application/_show_text_with_locators.html.erb b/apps/workbench/app/views/application/_show_text_with_locators.html.erb
index f25bd2b..4525c44 100644
--- a/apps/workbench/app/views/application/_show_text_with_locators.html.erb
+++ b/apps/workbench/app/views/application/_show_text_with_locators.html.erb
@@ -5,12 +5,27 @@
     <% text_data.each_line do |l| %>
       <% text_part = l %>
       <% match = keep_locator_in_json l %>
-      <% if match %>
-        <% text_part = match[1] %>
-        <% rindex = match[2].rindex('"'); match2 = match[2][0..rindex-1] %>
-        <% pdh_readable = object_readable(match2) %>
-        <% quote_char = '"' %>
-      <% end %>
-      <span style="white-space: pre-wrap; margin: none;"><%= text_part %><% if match %><% if pdh_readable then %><%= link_to_arvados_object_if_readable(match[3], match[3], friendly_name: true) %><%= link_to_arvados_object_if_readable(match2, match2, link_text: match[4]) %><% else %><%= match2%><% end %><%=quote_char+match[5]%><br/><% end %></span>
+
+      <%
+        if match
+          text_part = match[1]
+          rindex = match[2].rindex('"'); match2 = match[2][0..rindex-1]
+          quote_char = '"'
+
+          pdh_readable = object_readable(match2)
+          file_link = ''
+          if pdh_readable and match[4].size > 0
+            link_params = {controller: 'collections', action: 'show_file', uuid: match[3], file: match[4][1..-1]}
+            preview_allowed = preview_allowed_for(match[4])
+            if preview_allowed
+              file_link = link_to(raw(match[4]), link_params.merge(disposition: 'inline'))
+            else
+              file_link = link_to(raw(match[4]), link_params.merge(disposition: 'attachment'))
+            end
+          end
+        end
+      %>
+
+      <span style="white-space: pre-wrap; margin: none;"><%= text_part %><% if match %><% if pdh_readable then %><%= link_to_arvados_object_if_readable(match[3], match[3], friendly_name: true) %><%= file_link%><% else %><%= match2%><% end %><%=quote_char+match[5]%><br/><% end %></span>
     <% end %>
   </div>

commit 94054d9fdb3ce00cafda6300e32e456c29fc0041
Merge: 776885d 02b75a3
Author: radhika <radhika at curoverse.com>
Date:   Wed May 10 19:53:01 2017 -0400

    Merge branch 'master' into 10645-cr-display-perf


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


hooks/post-receive
--